@@ -13,9 +13,7 @@ ENV LANG en_US.UTF-8
13
13
ENV LC_ALL en_US.UTF-8
14
14
ENV PANDOC_VERSION 2.4
15
15
16
- # language export needed for ondrej/php PPA https://github.com/oerdnj/deb.sury.org/issues/56
17
- RUN export DEBIAN_FRONTEND=noninteractive && \
18
- apt-get -y update && \
16
+ RUN apt-get -y update && \
19
17
apt-get install -y --no-install-recommends software-properties-common language-pack-en-base apt-transport-https gnupg-curl && \
20
18
echo 'Acquire::Languages {"none";};' > /etc/apt/apt.conf.d/60language && \
21
19
echo 'LANG="en_US.UTF-8"' > /etc/default/locale && \
@@ -25,7 +23,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
25
23
apt-key adv --fetch-keys https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc && \
26
24
apt-key adv --fetch-keys https://packagecloud.io/github/git-lfs/gpgkey && \
27
25
apt-add-repository -y -s 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main' && \
28
- add-apt-repository -y ppa:ondrej/php && \
29
26
add-apt-repository -y ppa:openjdk-r/ppa && \
30
27
add-apt-repository -y ppa:git-core/ppa && \
31
28
add-apt-repository -y ppa:rwky/graphicsmagick && \
@@ -139,30 +136,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
139
136
nasm \
140
137
openjdk-8-jdk \
141
138
optipng \
142
- php5.6 \
143
- php5.6-xml \
144
- php5.6-mbstring \
145
- php5.6-gd \
146
- php5.6-sqlite3 \
147
- php5.6-curl \
148
- php5.6-zip \
149
- php5.6-intl \
150
- php7.2 \
151
- php7.2-xml \
152
- php7.2-mbstring \
153
- php7.2-gd \
154
- php7.2-sqlite3 \
155
- php7.2-curl \
156
- php7.2-zip \
157
- php7.2-intl \
158
- php7.4 \
159
- php7.4-xml \
160
- php7.4-mbstring \
161
- php7.4-gd \
162
- php7.4-sqlite3 \
163
- php7.4-curl \
164
- php7.4-zip \
165
- php7.4-intl \
166
139
pngcrush \
167
140
python-setuptools \
168
141
python \
@@ -261,7 +234,7 @@ RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A170311380
261
234
ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
262
235
263
236
# Match this set latest Stable releases we can support on https://www.ruby-lang.org/en/downloads/
264
- ENV RUBY_VERSION=2.7.1
237
+ ENV RUBY_VERSION=2.7.2
265
238
# Also preinstall Ruby 2.6.2, as many customers are pinned to it and installing is slow
266
239
RUN /bin/bash -c "source ~/.rvm/scripts/rvm && \
267
240
rvm install 2.6.2 && rvm use 2.6.2 && gem install bundler && \
@@ -290,7 +263,7 @@ RUN git clone https://github.com/creationix/nvm.git ~/.nvm && \
290
263
cd /
291
264
292
265
ENV ELM_VERSION=0.19.0-bugfix6
293
- ENV YARN_VERSION=1.22.4
266
+ ENV YARN_VERSION=1.22.10
294
267
295
268
ENV NETLIFY_NODE_VERSION="12.18.0"
296
269
@@ -392,6 +365,20 @@ RUN boot -u
392
365
393
366
USER root
394
367
368
+ COPY lib/dependencies /php/dependencies/
369
+ COPY lib/php/5.6 /php/5.6
370
+ COPY lib/php/7.2 /php/7.2
371
+ COPY lib/php/7.4 /php/7.4
372
+
373
+ RUN dpkg -i /php/dependencies/libssl1.1_1.1.1k-1+ubuntu16.04.1+deb.sury.org+0_amd64.deb
374
+ RUN dpkg -i /php/dependencies/psmisc_22.21-2.1ubuntu0.1_amd64.deb
375
+
376
+ RUN export DEBIAN_FRONTEND=noninteractive && \
377
+ dpkg -i /php/dependencies/*.deb && \
378
+ dpkg -i /php/5.6/*.deb && \
379
+ dpkg -i /php/7.2/*.deb && \
380
+ dpkg -i /php/7.4/*.deb
381
+
395
382
# set default to 5.6
396
383
RUN update-alternatives --set php /usr/bin/php5.6 && \
397
384
update-alternatives --set phar /usr/bin/phar5.6 && \
@@ -504,6 +491,7 @@ ADD run-build-functions.sh /opt/build-bin/run-build-functions.sh
504
491
ADD run-build.sh /opt/build-bin/build
505
492
ADD buildbot-git-config /root/.gitconfig
506
493
RUN rm -r /tmp/*
494
+ RUN rm -r /php
507
495
508
496
USER buildbot
509
497
ARG NF_IMAGE_VERSION
0 commit comments