Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.

Commit d51b4da

Browse files
authored
fix: php/iptables support for xenial and ruby and yarn upgrades (#576)
* fix: update ruby, yarn and fix php and iptables install for xenial Release-As: v3.8.0
1 parent 0582042 commit d51b4da

File tree

52 files changed

+20
-37
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+20
-37
lines changed

Dockerfile

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ ENV LANG en_US.UTF-8
1313
ENV LC_ALL en_US.UTF-8
1414
ENV PANDOC_VERSION 2.4
1515

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 && \
1917
apt-get install -y --no-install-recommends software-properties-common language-pack-en-base apt-transport-https gnupg-curl && \
2018
echo 'Acquire::Languages {"none";};' > /etc/apt/apt.conf.d/60language && \
2119
echo 'LANG="en_US.UTF-8"' > /etc/default/locale && \
@@ -25,7 +23,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
2523
apt-key adv --fetch-keys https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc && \
2624
apt-key adv --fetch-keys https://packagecloud.io/github/git-lfs/gpgkey && \
2725
apt-add-repository -y -s 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main' && \
28-
add-apt-repository -y ppa:ondrej/php && \
2926
add-apt-repository -y ppa:openjdk-r/ppa && \
3027
add-apt-repository -y ppa:git-core/ppa && \
3128
add-apt-repository -y ppa:rwky/graphicsmagick && \
@@ -139,30 +136,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
139136
nasm \
140137
openjdk-8-jdk \
141138
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 \
166139
pngcrush \
167140
python-setuptools \
168141
python \
@@ -261,7 +234,7 @@ RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A170311380
261234
ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
262235

263236
# 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
265238
# Also preinstall Ruby 2.6.2, as many customers are pinned to it and installing is slow
266239
RUN /bin/bash -c "source ~/.rvm/scripts/rvm && \
267240
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 && \
290263
cd /
291264

292265
ENV ELM_VERSION=0.19.0-bugfix6
293-
ENV YARN_VERSION=1.22.4
266+
ENV YARN_VERSION=1.22.10
294267

295268
ENV NETLIFY_NODE_VERSION="12.18.0"
296269

@@ -392,6 +365,20 @@ RUN boot -u
392365

393366
USER root
394367

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+
395382
# set default to 5.6
396383
RUN update-alternatives --set php /usr/bin/php5.6 && \
397384
update-alternatives --set phar /usr/bin/phar5.6 && \
@@ -504,6 +491,7 @@ ADD run-build-functions.sh /opt/build-bin/run-build-functions.sh
504491
ADD run-build.sh /opt/build-bin/build
505492
ADD buildbot-git-config /root/.gitconfig
506493
RUN rm -r /tmp/*
494+
RUN rm -r /php
507495

508496
USER buildbot
509497
ARG NF_IMAGE_VERSION

included_software.md

Lines changed: 2 additions & 1 deletion
Binary file not shown.
Binary file not shown.
12.9 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)