Skip to content

Updates PHP 8.1 and 8.2 native runtime dependencies #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 36 commits into from
Jun 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2097e5a
bump php82 versions
joedixon May 15, 2023
c6ce209
temp update publish.php
joedixon May 15, 2023
124c1e2
fix version
joedixon May 15, 2023
09ff385
update libxml2 version
joedixon May 15, 2023
bf210c2
bump php82al2-arm versions
joedixon May 15, 2023
a79a0d6
update openssl path
joedixon May 16, 2023
7b7c112
update libxml2
joedixon May 16, 2023
7f01380
typo
joedixon May 16, 2023
1951f74
update path
joedixon May 16, 2023
a2dec0e
wip
joedixon May 16, 2023
201cb31
wip
joedixon May 16, 2023
a1a45b2
wip
joedixon May 16, 2023
8b3e137
bump php81
joedixon May 16, 2023
a23b389
bump libxml php82
joedixon May 16, 2023
e396148
update sizes
joedixon May 16, 2023
848160a
wip
joedixon May 16, 2023
617a7ad
tidy
joedixon May 17, 2023
bbd38b8
bump curl
joedixon May 17, 2023
11aa035
move libxml2
joedixon May 17, 2023
8ec8a1b
dynamic oniguruma
joedixon May 17, 2023
ca90f25
update curl build
joedixon May 18, 2023
5ab133f
Use parallel compilation of cmake and nghttp2
GrahamCampbell May 18, 2023
f45c601
Correct cmake version
GrahamCampbell May 18, 2023
cc2fede
Enable TLS 1.3
GrahamCampbell May 18, 2023
e2d7298
Merge pull request #97 from GrahamCampbell/chore/version-audit
joedixon May 18, 2023
d27bc99
bump libxml
joedixon May 19, 2023
0240cd3
update sizes
joedixon May 19, 2023
846b424
bump php
joedixon May 19, 2023
1943ff1
allow aws credentials to be loaded
joedixon May 23, 2023
4fd1f74
pass aws credentials
joedixon May 23, 2023
fa23116
bump curl
joedixon May 23, 2023
f93411e
Upgrade to cURL 8.1.2
GrahamCampbell May 30, 2023
3a03105
Upgraded to libssh2 1.11.0
GrahamCampbell May 30, 2023
038c22b
Added missing spaces
GrahamCampbell May 30, 2023
c83c32b
Upgrade to CMake 3.26.4
GrahamCampbell May 30, 2023
55cb46e
Merge pull request #98 from GrahamCampbell/more-deps
joedixon May 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions php81al2/compiler.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ RUN set -xe \

# Install CMake

RUN yum -y install openssl-devel
RUN yum -y install openssl-devel perl-IPC-Cmd

RUN set -xe \
&& mkdir -p /tmp/cmake \
&& cd /tmp/cmake \
&& curl -Ls https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0.tar.gz \
&& curl -Ls https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4.tar.gz \
| tar xzC /tmp/cmake --strip-components=1 \
&& ./bootstrap --prefix=/usr/local \
&& make \
&& make -j $(nproc) \
&& make install
79 changes: 41 additions & 38 deletions php81al2/php.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ ENV CA_BUNDLE="${INSTALL_DIR}/ssl/cert.pem"

RUN set -xe; \
mkdir -p ${OPENSSL_BUILD_DIR}; \
curl -Ls https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_OPENSSL//./_}.tar.gz \
curl -Ls https://github.com/openssl/openssl/archive/openssl-${VERSION_OPENSSL}.tar.gz \
| tar xzC ${OPENSSL_BUILD_DIR} --strip-components=1

WORKDIR ${OPENSSL_BUILD_DIR}/
Expand All @@ -77,6 +77,7 @@ RUN set -xe; \
--prefix=${INSTALL_DIR} \
--openssldir=${INSTALL_DIR}/ssl \
--release \
enable-tls1_3 \
no-tests \
shared \
zlib
Expand All @@ -85,6 +86,39 @@ RUN set -xe; \
make install \
&& curl -L -k -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}

# Build LibXML2 (https://gitlab.gnome.org/GNOME/libxml2/-/releases)

ARG libxml2
ENV VERSION_XML2=${libxml2}
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2

RUN set -xe; \
mkdir -p ${XML2_BUILD_DIR}; \
curl -Ls https://download.gnome.org/sources/libxml2/${VERSION_XML2%.*}/libxml2-${VERSION_XML2}.tar.xz \
| tar xJC ${XML2_BUILD_DIR} --strip-components=1

WORKDIR ${XML2_BUILD_DIR}/

RUN set -xe; \
CFLAGS="" \
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
./configure \
--prefix=${INSTALL_DIR} \
--with-sysroot=${INSTALL_DIR} \
--enable-shared \
--disable-static \
--with-html \
--with-history \
--enable-ipv6=no \
--with-icu \
--with-zlib=${INSTALL_DIR} \
--without-python

RUN set -xe; \
make install \
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config

# Build LibSSH2 (https://github.com/libssh2/libssh2/releases/)

ARG libssh2
Expand Down Expand Up @@ -129,8 +163,8 @@ RUN set -xe; \
autoreconf -i && \
automake && \
autoconf && \
./configure && \
make && \
./configure --enable-lib-only --prefix=${INSTALL_DIR} && \
make -j $(nproc) && \
make install

# Build Curl (https://github.com/curl/curl/releases/)
Expand Down Expand Up @@ -172,44 +206,11 @@ RUN set -xe; \
--with-gnu-ld \
--with-ssl \
--with-libssh2 \
--with-nghttp2=/usr/local
--with-nghttp2

RUN set -xe; \
make install

# Build LibXML2 (https://github.com/GNOME/libxml2/releases)

ARG libxml2
ENV VERSION_XML2=${libxml2}
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2

RUN set -xe; \
mkdir -p ${XML2_BUILD_DIR}; \
curl -Ls http://xmlsoft.org/sources/libxml2-${VERSION_XML2}.tar.gz \
| tar xzC ${XML2_BUILD_DIR} --strip-components=1

WORKDIR ${XML2_BUILD_DIR}/

RUN set -xe; \
CFLAGS="" \
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
./configure \
--prefix=${INSTALL_DIR} \
--with-sysroot=${INSTALL_DIR} \
--enable-shared \
--disable-static \
--with-html \
--with-history \
--enable-ipv6=no \
--with-icu \
--with-zlib=${INSTALL_DIR} \
--without-python

RUN set -xe; \
make install \
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config

# Build Libzip (https://github.com/nih-at/libzip/releases)

ARG libzip
Expand Down Expand Up @@ -336,11 +337,13 @@ RUN set -xe; \

# Build Oniguruma

ARG oniguruma
ENV VERSION_ONIGURUMA=${oniguruma}
ENV LIBONIG_BUILD_DIR=${BUILD_DIR}/libonig

RUN set -xe \
&& mkdir -p ${LIBONIG_BUILD_DIR}/bin \
&& curl -Ls https://github.com/kkos/oniguruma/releases/download/v6.9.6/onig-6.9.6.tar.gz \
&& curl -Ls https://github.com/kkos/oniguruma/releases/download/v${VERSION_ONIGURUMA}/onig-${VERSION_ONIGURUMA}.tar.gz \
| tar xzC ${LIBONIG_BUILD_DIR} --strip-components=1

WORKDIR ${LIBONIG_BUILD_DIR}/
Expand Down
19 changes: 10 additions & 9 deletions php81al2/versions.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[php81]
php = "8.1.8"
curl = "7.83.0"
php = "8.1.19"
curl = "8.1.2"
libjpeg = "v9e"
libpng = "1.6.37"
libpng = "1.6.39"
libsodium = "1.0.18"
libssh2 = "1.10.0"
libxml2 = "2.9.12"
libzip ="1.8.0"
nghttp2 ="1.47.0"
openssl = "1.1.1o"
postgres = "14.4"
libssh2 = "1.11.0"
libxml2 = "2.11.4"
libzip = "1.9.2"
nghttp2 = "1.53.0"
oniguruma = "6.9.8"
openssl = "3.0.8"
postgres = "15.3"
redis = "5.3.7"
zlib = "1.2.13"
6 changes: 3 additions & 3 deletions php82al2-arm/compiler.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ RUN set -xe \

# Install CMake

RUN yum -y install openssl-devel
RUN yum -y install openssl-devel perl-IPC-Cmd

RUN set -xe \
&& mkdir -p /tmp/cmake \
&& cd /tmp/cmake \
&& curl -Ls https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0.tar.gz \
&& curl -Ls https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4.tar.gz \
| tar xzC /tmp/cmake --strip-components=1 \
&& ./bootstrap --prefix=/usr/local \
&& make \
&& make -j $(nproc) \
&& make install
79 changes: 41 additions & 38 deletions php82al2-arm/php.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ENV CA_BUNDLE="${INSTALL_DIR}/ssl/cert.pem"

RUN set -xe; \
mkdir -p ${OPENSSL_BUILD_DIR}; \
curl -Ls https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_OPENSSL//./_}.tar.gz \
curl -Ls https://github.com/openssl/openssl/archive/openssl-${VERSION_OPENSSL}.tar.gz \
| tar xzC ${OPENSSL_BUILD_DIR} --strip-components=1

WORKDIR ${OPENSSL_BUILD_DIR}/
Expand All @@ -76,6 +76,7 @@ RUN set -xe; \
--prefix=${INSTALL_DIR} \
--openssldir=${INSTALL_DIR}/ssl \
--release \
enable-tls1_3 \
no-tests \
shared \
zlib
Expand All @@ -84,6 +85,39 @@ RUN set -xe; \
make install \
&& curl -L -k -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}

# Build LibXML2 (https://gitlab.gnome.org/GNOME/libxml2/-/releases)

ARG libxml2
ENV VERSION_XML2=${libxml2}
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2

RUN set -xe; \
mkdir -p ${XML2_BUILD_DIR}; \
curl -Ls https://download.gnome.org/sources/libxml2/${VERSION_XML2%.*}/libxml2-${VERSION_XML2}.tar.xz \
| tar xJC ${XML2_BUILD_DIR} --strip-components=1

WORKDIR ${XML2_BUILD_DIR}/

RUN set -xe; \
CFLAGS="" \
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
./configure \
--prefix=${INSTALL_DIR} \
--with-sysroot=${INSTALL_DIR} \
--enable-shared \
--disable-static \
--with-html \
--with-history \
--enable-ipv6=no \
--with-icu \
--with-zlib=${INSTALL_DIR} \
--without-python

RUN set -xe; \
make install \
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config

# Build LibSSH2 (https://github.com/libssh2/libssh2/releases/)

ARG libssh2
Expand Down Expand Up @@ -128,8 +162,8 @@ RUN set -xe; \
autoreconf -i && \
automake && \
autoconf && \
./configure && \
make && \
./configure --enable-lib-only --prefix=${INSTALL_DIR} && \
make -j $(nproc) && \
make install

# Build Curl (https://github.com/curl/curl/releases/)
Expand Down Expand Up @@ -171,44 +205,11 @@ RUN set -xe; \
--with-gnu-ld \
--with-ssl \
--with-libssh2 \
--with-nghttp2=/usr/local
--with-nghttp2

RUN set -xe; \
make install

# Build LibXML2 (https://github.com/GNOME/libxml2/releases)

ARG libxml2
ENV VERSION_XML2=${libxml2}
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2

RUN set -xe; \
mkdir -p ${XML2_BUILD_DIR}; \
curl -Ls http://xmlsoft.org/sources/libxml2-${VERSION_XML2}.tar.gz \
| tar xzC ${XML2_BUILD_DIR} --strip-components=1

WORKDIR ${XML2_BUILD_DIR}/

RUN set -xe; \
CFLAGS="" \
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
./configure \
--prefix=${INSTALL_DIR} \
--with-sysroot=${INSTALL_DIR} \
--enable-shared \
--disable-static \
--with-html \
--with-history \
--enable-ipv6=no \
--with-icu \
--with-zlib=${INSTALL_DIR} \
--without-python

RUN set -xe; \
make install \
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config

# Build Libzip (https://github.com/nih-at/libzip/releases)

ARG libzip
Expand Down Expand Up @@ -335,11 +336,13 @@ RUN set -xe; \

# Build Oniguruma

ARG oniguruma
ENV VERSION_ONIGURUMA=${oniguruma}
ENV LIBONIG_BUILD_DIR=${BUILD_DIR}/libonig

RUN set -xe \
&& mkdir -p ${LIBONIG_BUILD_DIR}/bin \
&& curl -Ls https://github.com/kkos/oniguruma/releases/download/v6.9.6/onig-6.9.6.tar.gz \
&& curl -Ls https://github.com/kkos/oniguruma/releases/download/v${VERSION_ONIGURUMA}/onig-${VERSION_ONIGURUMA}.tar.gz \
| tar xzC ${LIBONIG_BUILD_DIR} --strip-components=1

WORKDIR ${LIBONIG_BUILD_DIR}/
Expand Down
21 changes: 11 additions & 10 deletions php82al2-arm/versions.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[php82]
php = "8.2.0"
curl = "7.85.0"
php = "8.2.6"
curl = "8.1.2"
libjpeg = "v9e"
libpng = "1.6.38"
libpng = "1.6.39"
libsodium = "1.0.18"
libssh2 = "1.10.0"
libxml2 = "2.9.12"
libzip ="1.9.2"
nghttp2 ="1.50.0"
openssl = "1.1.1q"
postgres = "14.5"
redis = "5.3.7 "
libssh2 = "1.11.0"
libxml2 = "2.11.4"
libzip = "1.9.2"
nghttp2 = "1.53.0"
oniguruma = "6.9.8"
openssl = "3.0.8"
postgres = "15.3"
redis = "5.3.7"
zlib = "1.2.13"
6 changes: 3 additions & 3 deletions php82al2/compiler.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ RUN set -xe \

# Install CMake

RUN yum -y install openssl-devel
RUN yum -y install openssl-devel perl-IPC-Cmd

RUN set -xe \
&& mkdir -p /tmp/cmake \
&& cd /tmp/cmake \
&& curl -Ls https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0.tar.gz \
&& curl -Ls https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4.tar.gz \
| tar xzC /tmp/cmake --strip-components=1 \
&& ./bootstrap --prefix=/usr/local \
&& make \
&& make -j $(nproc) \
&& make install
Loading