diff --git a/7.3-alpine/Dockerfile b/7.3-alpine/Dockerfile index 5ddaa98..3ff5f57 100644 --- a/7.3-alpine/Dockerfile +++ b/7.3-alpine/Dockerfile @@ -1,12 +1,12 @@ # maintainer information. FROM webdevops/php-nginx:7.3-alpine -MAINTAINER Belman Kraul +LABEL maintainer="Belman Kraul " # install php modules and drivers. ENV MSSQL_DRIVER_VERSION=6.1.1-1 -RUN set -x \ +RUN \ # install the build pre-requisites. - && apk add --no-cache --virtual .build-deps autoconf file g++ make pkgconf re2c php7-dev unixodbc-dev libmcrypt-dev \ + apk add --no-cache --virtual .build-deps autoconf file g++ make pkgconf re2c php7-dev unixodbc-dev \ # install mssql drivers && curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.${MSSQL_DRIVER_VERSION}_amd64.apk \ && curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_17.${MSSQL_DRIVER_VERSION}_amd64.apk \ @@ -17,12 +17,15 @@ RUN set -x \ && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc \ && /bin/bash -c "source ~/.bashrc" \ # install the pecl extensions. + # for php-tidy we must leave behind the tidyhtml-dev libraries + # as tidy.so requires dev libraries such as libtidy.so.5. + && apk add tidyhtml-dev \ + && docker-php-ext-install tidy \ && pecl install pdo_sqlsrv \ && pecl install sqlsrv \ && pecl install igbinary \ && pecl install msgpack \ # enable the extensions. - #&& echo extension=mcrypt.so > /etc/php7/conf.d/20-mcrypt.ini \ && echo extension=pdo_sqlsrv.so > `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30_pdo_sqlsrv.ini \ && echo extension=sqlsrv.so > `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20_sqlsrv.ini \ && echo extension=igbinary.so > `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20_igbinary.ini \ @@ -36,8 +39,8 @@ RUN set -x \ # build node. ENV NODE_VERSION 12.19.0 -RUN set -x \ - && apk add --no-cache \ +RUN \ + apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ @@ -108,8 +111,8 @@ RUN set -x \ # build yarn ENV YARN_VERSION 1.22.5 -RUN set -x \ - && apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ +RUN \ + apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ diff --git a/7.3/Dockerfile b/7.3/Dockerfile index c70cef0..0c72a4c 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -1,9 +1,10 @@ FROM webdevops/php-nginx:7.3 -MAINTAINER Belman Kraul +LABEL maintainer="Belman Kraul " -RUN set -x \ +# install php modules and drivers. +RUN \ # install pre-requisites. - && apt-install locales gnupg \ + apt-install locales gnupg \ && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \ && locale-gen \ # install the mssql driver. @@ -13,21 +14,85 @@ RUN set -x \ && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bash_profile \ && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc \ && /bin/bash -c "source ~/.bashrc" \ - && apt-install libmcrypt-dev \ # install the pecl extensions - && pecl install mcrypt-1.0.2 \ + # for php-tidy we must leave behind the tidyhtml-dev libraries + # as tidy.so requires dev libraries such as libtidy.so.5. + && apt-install libtidy-dev \ + && docker-php-ext-install tidy \ && pecl install sqlsrv \ && pecl install pdo_sqlsrv \ && pecl install igbinary \ && pecl install msgpack \ - && echo extension=mcrypt.so > /usr/local/etc/php/conf.d/20-mcrypt.ini \ && echo extension=pdo_sqlsrv.so > /usr/local/etc/php/conf.d/30-pdo_sqlsrv.ini \ && echo extension=sqlsrv.so > /usr/local/etc/php/conf.d/20-sqlsrv.ini \ && echo extension=igbinary.so > /usr/local/etc/php/conf.d/20-igbinary.ini \ && echo extension=msgpack.so > /usr/local/etc/php/conf.d/20-msgpack.ini \ # uninstall all headers and libraries && apt-get purge -y -f --force-yes \ - libmcrypt-dev unixodbc-dev \ + unixodbc-dev \ # perform image cleanup. && docker-run-bootstrap \ && docker-image-cleanup + +# build node version. +ENV NODE_VERSION 12.20.0 +RUN \ + ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && set -ex \ + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 +RUN \ + for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version diff --git a/7.4-alpine/Dockerfile b/7.4-alpine/Dockerfile index 81c3bb0..ee99771 100644 --- a/7.4-alpine/Dockerfile +++ b/7.4-alpine/Dockerfile @@ -1,12 +1,12 @@ # maintainer information. FROM webdevops/php-nginx:7.4-alpine -MAINTAINER Belman Kraul +LABEL maintainer="Belman Kraul " # install php modules and drivers. ENV MSSQL_DRIVER_VERSION=6.1.1-1 -RUN set -x \ +RUN \ # install the build pre-requisites. - && apk add --no-cache --virtual .build-deps autoconf file g++ make pkgconf re2c php7-dev unixodbc-dev libmcrypt-dev \ + apk add --no-cache --virtual .build-deps autoconf file g++ make pkgconf re2c php7-dev unixodbc-dev \ # install mssql drivers && curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.${MSSQL_DRIVER_VERSION}_amd64.apk \ && curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_17.${MSSQL_DRIVER_VERSION}_amd64.apk \ @@ -17,7 +17,10 @@ RUN set -x \ && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc \ && /bin/bash -c "source ~/.bashrc" \ # install the pecl extensions. - #&& pecl install mcrypt-1.0.2 \ + # for php-tidy we must leave behind the tidyhtml-dev libraries + # as tidy.so requires dev libraries such as libtidy.so.5. + && apk add tidyhtml-dev \ + && docker-php-ext-install tidy \ && pecl install pdo_sqlsrv \ && pecl install sqlsrv \ && pecl install igbinary \ @@ -41,8 +44,8 @@ RUN set -x \ # build node. ENV NODE_VERSION 12.19.0 -RUN set -x \ - && apk add --no-cache \ +RUN \ + apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ @@ -111,8 +114,8 @@ RUN set -x \ # build yarn ENV YARN_VERSION 1.22.5 -RUN set -x \ - && apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ +RUN \ + apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \