Skip to content

Commit 1b30082

Browse files
committed
Fixes to php container.
1 parent 6eb8224 commit 1b30082

File tree

1 file changed

+31
-24
lines changed

1 file changed

+31
-24
lines changed

php/Dockerfile

+31-24
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ RUN apt-get update -y \
1717
fontforge \
1818
git \
1919
gnupg \
20+
iproute2 \
2021
iputils-ping \
2122
locales \
2223
locales-all \
@@ -102,12 +103,7 @@ RUN pecl install -of mongodb \
102103
# Install PECL php-xdebug
103104
RUN pecl install -of xdebug \
104105
&& rm -rf /tmp/pear \
105-
&& echo "zend_extension=xdebug.so" | tee /usr/local/etc/php/conf.d/xdebug.ini \
106-
&& echo "xdebug.max_nesting_level = 1000" | tee -a /usr/local/etc/php/conf.d/xdebug.ini \
107-
&& echo "xdebug.idekey = basisPhp" | tee -a /usr/local/etc/php/conf.d/xdebug.ini \
108-
&& echo "xdebug.remote_enable = 1" | tee -a /usr/local/etc/php/conf.d/xdebug.ini \
109-
&& echo "xdebug.remote_port = 54321" | tee -a /usr/local/etc/php/conf.d/xdebug.ini \
110-
&& echo "xdebug.remote_connect_back = 1" | tee -a /usr/local/etc/php/conf.d/xdebug.ini
106+
&& echo "zend_extension=xdebug.so" | tee /usr/local/etc/php/conf.d/xdebug.ini
111107

112108
# Port for XDebug
113109
EXPOSE 54321
@@ -133,36 +129,47 @@ RUN service rsyslog start && service cron start && service --status-all
133129
RUN php -m
134130

135131
# Install Node
136-
RUN set -ex \
132+
ENV NPM_CONFIG_LOGLEVEL warn
133+
ENV NODE_VERSION 14.15.5
134+
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
135+
&& case "${dpkgArch##*-}" in \
136+
amd64) ARCH='x64';; \
137+
ppc64el) ARCH='ppc64le';; \
138+
s390x) ARCH='s390x';; \
139+
arm64) ARCH='arm64';; \
140+
armhf) ARCH='armv7l';; \
141+
i386) ARCH='x86';; \
142+
*) echo "unsupported architecture"; exit 1 ;; \
143+
esac \
144+
# gpg keys listed at https://github.com/nodejs/node#release-keys
145+
&& set -ex \
137146
&& for key in \
147+
4ED778F539E3634C779C87C6D7062848A1AB005C \
138148
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
139-
FD3A5288F042B6850C66B31F09FE44734EB7990E \
149+
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
140150
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
141-
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
142-
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
143-
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
144-
77984A986EBC2AA786BC0F66B01FBB92821C587A \
145151
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
146-
4ED778F539E3634C779C87C6D7062848A1AB005C \
152+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
153+
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
154+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
147155
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
156+
108F52B48DB57BB0CC439B2997B01419BD92F80A \
148157
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
149158
; do \
150159
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
151160
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
152161
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
153-
done
154-
155-
ENV NPM_CONFIG_LOGLEVEL warn
156-
ENV NODE_VERSION 12.19.0
157-
ENV NPM_VERSION 6
158-
RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
159-
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
162+
done \
163+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
164+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
160165
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
161-
&& grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
162-
&& tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
163-
&& rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
166+
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
167+
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
168+
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
164169
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
165-
&& npm install -g npm@$NPM_VERSION \
170+
# smoke tests
171+
&& node --version \
172+
&& npm --version \
166173
&& rm -rf /tmp/npm-*
167174

168175
# Install Node global dependencies

0 commit comments

Comments
 (0)