ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2906 from PavelSavushkinMix/fix/pgsql_client 

fix(PGSql Client): get installed PGSql Client with the same versions
This commit is contained in:
Shao Yu-Lung (Allen) 2021-03-22 17:55:12 +08:00 committed by GitHub
parent 7da6963ef2 7e76948504
commit 4f24c6a005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
php-fpm/Dockerfile
View File

@ -39,6 +39,7 @@ RUN set -xe; \
pecl channel-update pecl.php.net && \ pecl channel-update pecl.php.net && \
apt-get install -yqq \ apt-get install -yqq \
apt-utils \ apt-utils \
git \
# #
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
# Mandatory Software's Installation # Mandatory Software's Installation
@ -77,7 +78,7 @@ RUN set -xe; \
ARG INSTALL_BZ2=false ARG INSTALL_BZ2=false
RUN if [ ${INSTALL_BZ2} = true ]; then \ RUN if [ ${INSTALL_BZ2} = true ]; then \
apt-get -y install libbz2-dev; \ apt-get -yqq install libbz2-dev; \
docker-php-ext-install bz2 \ docker-php-ext-install bz2 \
;fi ;fi
@ -89,7 +90,7 @@ ARG INSTALL_GMP=false
RUN if [ ${INSTALL_GMP} = true ]; then \ RUN if [ ${INSTALL_GMP} = true ]; then \
# Install the GMP extension # Install the GMP extension
apt-get install -y libgmp-dev && \ apt-get install -yqq libgmp-dev && \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \ ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \
;fi && \ ;fi && \
@ -137,7 +138,7 @@ USER root
ARG INSTALL_FAKETIME=false ARG INSTALL_FAKETIME=false
RUN if [ ${INSTALL_FAKETIME} = true ]; then \ RUN if [ ${INSTALL_FAKETIME} = true ]; then \
apt-get install -y libfaketime \ apt-get install -yqq libfaketime \
;fi ;fi
########################################################################### ###########################################################################
@ -184,14 +185,16 @@ ARG INSTALL_PG_CLIENT=false
ARG INSTALL_POSTGIS=false ARG INSTALL_POSTGIS=false
RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
# Create folders if not exists (https://github.com/tianon/docker-brew-debian/issues/65) apt-get install -yqq gnupg \
mkdir -p /usr/share/man/man1 && \ && . /etc/os-release \
mkdir -p /usr/share/man/man7 && \ && echo "deb http://apt.postgresql.org/pub/repos/apt $VERSION_CODENAME-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
# Install the pgsql client && curl -sL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
apt-get install -y postgresql-client && \ && apt-get update -yqq \
&& apt-get install -yqq postgresql-client-12 postgis; \
if [ ${INSTALL_POSTGIS} = true ]; then \ if [ ${INSTALL_POSTGIS} = true ]; then \
apt-get install -y postgis; \ apt-get install -yqq postgis; \
fi \ fi \
&& apt-get purge -yqq gnupg \
;fi ;fi
########################################################################### ###########################################################################
@ -261,7 +264,7 @@ ARG INSTALL_PHPDBG=false
RUN if [ ${INSTALL_PHPDBG} = true ]; then \ RUN if [ ${INSTALL_PHPDBG} = true ]; then \
# Load the xdebug extension only with phpunit commands # Load the xdebug extension only with phpunit commands
apt-get install -y --force-yes php${LARADOCK_PHP_VERSION}-phpdbg \ apt-get install -yqq --force-yes php${LARADOCK_PHP_VERSION}-phpdbg \
;fi ;fi
########################################################################### ###########################################################################
@ -576,7 +579,7 @@ ENV OCI_VERSION=12
RUN if [ ${INSTALL_OCI8} = true ]; then \ RUN if [ ${INSTALL_OCI8} = true ]; then \
# Install wget # Install wget
apt-get update && apt-get install --no-install-recommends -y wget \ apt-get install --no-install-recommends -yqq wget \
# Install Oracle Instantclient # Install Oracle Instantclient
&& mkdir /opt/oracle \ && mkdir /opt/oracle \
&& cd /opt/oracle \ && cd /opt/oracle \
@ -589,10 +592,9 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
&& ln -s /opt/oracle/instantclient_12_1/libocci.so.12.1 /opt/oracle/instantclient_12_1/libocci.so \ && ln -s /opt/oracle/instantclient_12_1/libocci.so.12.1 /opt/oracle/instantclient_12_1/libocci.so \
&& rm -rf /opt/oracle/*.zip \ && rm -rf /opt/oracle/*.zip \
# Install PHP extensions deps # Install PHP extensions deps
&& apt-get update \ && apt-get install --no-install-recommends -yqq \
&& apt-get install --no-install-recommends -y \ libaio-dev \
libaio-dev \ freetds-dev && \
freetds-dev && \
# Install PHP extensions # Install PHP extensions
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.10; \ echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.10; \
@ -656,7 +658,7 @@ ARG INSTALL_INTL=false
RUN if [ ${INSTALL_INTL} = true ]; then \ RUN if [ ${INSTALL_INTL} = true ]; then \
# Install intl and requirements # Install intl and requirements
apt-get install -y zlib1g-dev libicu-dev g++ && \ apt-get install -yqq zlib1g-dev libicu-dev g++ && \
docker-php-ext-configure intl && \ docker-php-ext-configure intl && \
docker-php-ext-install intl \ docker-php-ext-install intl \
;fi ;fi
@ -670,7 +672,7 @@ ARG INSTALL_GHOSTSCRIPT=false
RUN if [ ${INSTALL_GHOSTSCRIPT} = true ]; then \ RUN if [ ${INSTALL_GHOSTSCRIPT} = true ]; then \
# Install the ghostscript extension # Install the ghostscript extension
# for PDF editing # for PDF editing
apt-get install -y \ apt-get install -yqq \
poppler-utils \ poppler-utils \
ghostscript \ ghostscript \
;fi ;fi
@ -682,7 +684,7 @@ RUN if [ ${INSTALL_GHOSTSCRIPT} = true ]; then \
ARG INSTALL_LDAP=false ARG INSTALL_LDAP=false
RUN if [ ${INSTALL_LDAP} = true ]; then \ RUN if [ ${INSTALL_LDAP} = true ]; then \
apt-get install -y libldap2-dev && \ apt-get install -yqq libldap2-dev && \
docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \ docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
docker-php-ext-install ldap \ docker-php-ext-install ldap \
;fi ;fi
@ -706,12 +708,12 @@ RUN set -eux; \
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
########################################################################### ###########################################################################
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
apt-get install -y apt-transport-https gnupg \ apt-get install -yqq apt-transport-https gnupg \
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
&& curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list \ && curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& apt-get update -yqq \ && apt-get update -yqq \
# Install Dependencies # Install Dependencies
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql17 locales \ && ACCEPT_EULA=Y apt-get install -yqq unixodbc unixodbc-dev libgss3 odbcinst msodbcsql17 locales \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
# link local aliases # link local aliases
&& ln -sfn /etc/locale.alias /usr/share/locale/locale.alias \ && ln -sfn /etc/locale.alias /usr/share/locale/locale.alias \
@ -737,7 +739,7 @@ USER root
ARG INSTALL_IMAGE_OPTIMIZERS=false ARG INSTALL_IMAGE_OPTIMIZERS=false
RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
apt-get install -y jpegoptim optipng pngquant gifsicle \ apt-get install -yqq jpegoptim optipng pngquant gifsicle \
;fi ;fi
########################################################################### ###########################################################################
@ -751,9 +753,8 @@ ARG IMAGEMAGICK_VERSION=latest
ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION} ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION}
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y libmagickwand-dev imagemagick && \ apt-get install -yqq libmagickwand-dev imagemagick && \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
apt-get install -y git && \
cd /tmp && \ cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \ if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
git clone https://github.com/Imagick/imagick; \ git clone https://github.com/Imagick/imagick; \
@ -779,7 +780,7 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
ARG INSTALL_SMB=false ARG INSTALL_SMB=false
RUN if [ ${INSTALL_SMB} = true ]; then \ RUN if [ ${INSTALL_SMB} = true ]; then \
apt-get install -y smbclient php-smbclient coreutils \ apt-get install -yqq smbclient php-smbclient coreutils \
;fi ;fi
########################################################################### ###########################################################################
@ -789,7 +790,7 @@ RUN if [ ${INSTALL_SMB} = true ]; then \
ARG INSTALL_IMAP=false ARG INSTALL_IMAP=false
RUN if [ ${INSTALL_IMAP} = true ]; then \ RUN if [ ${INSTALL_IMAP} = true ]; then \
apt-get install -y libc-client-dev libkrb5-dev && \ apt-get install -yqq libc-client-dev libkrb5-dev && \
docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install imap \ docker-php-ext-install imap \
;fi ;fi
@ -819,7 +820,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
RUN if [ $INSTALL_PHALCON = true ]; then \ RUN if [ $INSTALL_PHALCON = true ]; then \
apt-get update && apt-get install -y unzip libpcre3-dev gcc make re2c git automake autoconf\ apt-get install -yqq unzip libpcre3-dev gcc make re2c git automake autoconf\
&& git clone https://github.com/jbboehr/php-psr.git \ && git clone https://github.com/jbboehr/php-psr.git \
&& cd php-psr \ && cd php-psr \
&& phpize \ && phpize \
@ -859,8 +860,8 @@ USER root
ARG INSTALL_YAML=false ARG INSTALL_YAML=false
RUN if [ ${INSTALL_YAML} = true ]; then \ RUN if [ ${INSTALL_YAML} = true ]; then \
apt-get install -yqq libyaml-dev \ apt-get install -yqq libyaml-dev; \
&& if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
echo '' | pecl install -a yaml-1.3.2; \ echo '' | pecl install -a yaml-1.3.2; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
echo '' | pecl install yaml-2.0.4; \ echo '' | pecl install yaml-2.0.4; \
@ -877,7 +878,7 @@ RUN if [ ${INSTALL_YAML} = true ]; then \
ARG INSTALL_RDKAFKA=false ARG INSTALL_RDKAFKA=false
RUN if [ ${INSTALL_RDKAFKA} = true ]; then \ RUN if [ ${INSTALL_RDKAFKA} = true ]; then \
apt-get install -y librdkafka-dev && \ apt-get install -yqq librdkafka-dev && \
pecl install rdkafka && \ pecl install rdkafka && \
docker-php-ext-enable rdkafka \ docker-php-ext-enable rdkafka \
;fi ;fi
@ -889,7 +890,7 @@ RUN if [ ${INSTALL_RDKAFKA} = true ]; then \
ARG INSTALL_GETTEXT=false ARG INSTALL_GETTEXT=false
RUN if [ ${INSTALL_GETTEXT} = true ]; then \ RUN if [ ${INSTALL_GETTEXT} = true ]; then \
apt-get install -y zlib1g-dev libicu-dev g++ libpq-dev libssl-dev gettext && \ apt-get install -yqq zlib1g-dev libicu-dev g++ libpq-dev libssl-dev gettext && \
docker-php-ext-install gettext \ docker-php-ext-install gettext \
;fi ;fi
@ -901,7 +902,7 @@ ARG INSTALL_ADDITIONAL_LOCALES=false
ARG ADDITIONAL_LOCALES ARG ADDITIONAL_LOCALES
RUN if [ ${INSTALL_ADDITIONAL_LOCALES} = true ]; then \ RUN if [ ${INSTALL_ADDITIONAL_LOCALES} = true ]; then \
apt-get install -y locales \ apt-get install -yqq locales \
&& echo '' >> /usr/share/locale/locale.alias \ && echo '' >> /usr/share/locale/locale.alias \
&& temp="${ADDITIONAL_LOCALES%\"}" \ && temp="${ADDITIONAL_LOCALES%\"}" \
&& temp="${temp#\"}" \ && temp="${temp#\"}" \
@ -981,7 +982,7 @@ USER root
ARG INSTALL_AUDIOWAVEFORM=false ARG INSTALL_AUDIOWAVEFORM=false
RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
apt-get -y install git wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \ apt-get -y install wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \
&& git clone https://github.com/bbc/audiowaveform.git \ && git clone https://github.com/bbc/audiowaveform.git \
&& cd audiowaveform \ && cd audiowaveform \
&& wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \ && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \
@ -1005,17 +1006,17 @@ USER root
ARG INSTALL_WKHTMLTOPDF=false ARG INSTALL_WKHTMLTOPDF=false
RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \
apt-get install -y \ apt-get install -yqq \
libxrender1 \ libxrender1 \
libfontconfig1 \ libfontconfig1 \
libx11-dev \ libx11-dev \
libjpeg62 \ libjpeg62 \
libxtst6 \ libxtst6 \
fontconfig \ fontconfig \
libjpeg62-turbo \ libjpeg62-turbo \
xfonts-base \ xfonts-base \
xfonts-75dpi \ xfonts-75dpi \
wget \ wget \
&& wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.stretch_amd64.deb \ && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.stretch_amd64.deb \
&& dpkg -i wkhtmltox_0.12.6-1.stretch_amd64.deb \ && dpkg -i wkhtmltox_0.12.6-1.stretch_amd64.deb \
&& apt -f install \ && apt -f install \