Skip to content

[INFRA] revert some recent changes and bump versions #64

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.

Sign up for GitHub

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
mautz-et-tong merged 1 commit into from
Mar 4, 2025
Merged

[INFRA] revert some recent changes and bump versions #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/php-8.3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
version: ['8.3']
patchVersion: [10,11,12,13,14,15]
patchVersion: [12,13,14,15,16]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/php-8.4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
version: ['8.4']
patchVersion: [0,1,2]
patchVersion: [0,1,2,3]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
48 changes: 32 additions & 16 deletions src/7.4/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM openmage/php-base:bullseye-latest AS php
FROM openmage/php-base:bookworm-latest AS php

COPY FS /

ARG PHP_RUNTIME_REQUIREMENTS="jq curl libcurl3-gnutls ca-certificates libedit2 libgmp-dev libfreetype6 libltdl7 libmcrypt4 sqlite3 libpng16-16 libzip4 zip libfcgi-bin libtidy5deb1 libsodium23 libonig5 cron vim.tiny php-xdebug zip"
ARG PHP_RUNTIME_REQUIREMENTS="jq curl libcurl3-gnutls ca-certificates libedit2 libgmp-dev libfreetype6 libltdl7 libmcrypt4 sqlite3 libpng16-16 libzip4 libfcgi-bin libtidy5deb1 libsodium23 libonig5 cron vim.tiny php-xdebug zip"
ARG PHP_RUNTIME_REQUIREMENTS_EXTRA=""
ARG PHP_BUILD_REQUIREMENTS="build-essential dpkg-dev automake autoconf libtool file g++ gcc libc-dev make pkg-config re2c libxml2-dev libcurl4-gnutls-dev libtidy-dev libsqlite3-dev libssl-dev libxml2-dev zlib1g-dev libpng-dev libreadline6-dev libfreetype6-dev libmcrypt-dev libedit-dev libltdl-dev libxslt-dev libzip-dev libsodium-dev libonig-dev gnupg2 argon2 libargon2-0 libargon2-dev libzip-dev"
ARG PHP_BUILD_REQUIREMENTS="build-essential curl dpkg-dev automake autoconf libtool file g++ gcc libc-dev make pkg-config re2c libxml2-dev libcurl4-gnutls-dev libtidy-dev libsqlite3-dev libssl-dev libxml2-dev zlib1g-dev libpng-dev liblzf-dev libreadline6-dev libfreetype6-dev libmcrypt-dev libedit-dev libltdl-dev libxslt-dev libzip-dev libsodium-dev libonig-dev gnupg2 argon2 libargon2-0 libargon2-dev libzip-dev"
ARG PHP_BUILD_REQUIREMENTS_EXTRA=""
ARG PHP_PECL_REQUIREMENTS="redis igbinary"
ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl"
Expand All @@ -26,6 +26,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \

### configure php
# hadolint ignore=DL4006,SC2039,DL3003
# hadolint ignore=DL4006,SC2039,DL3003
RUN set -xe; \
\
chmod 755 /usr/local/bin/docker-entrypoint; \
Expand Down Expand Up @@ -82,18 +83,28 @@ RUN set -xe; \
${PHP_CONFIGURE_ARGS_FPM:-} \
; \
make -j "$(nproc)"; \
make install; \
mkdir -p /usr/src/php/ext/imagick; \
curl -fsSL https://github.com/Imagick/imagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz | tar xvz -C "/usr/src/php/ext/imagick" --strip 1; \
docker-php-ext-install imagick gd zip; \
make install;
RUN curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
&& tar --strip-components=1 -xf /tmp/imagick.tar.gz \
&& phpize \
&& ./configure \
&& make \
&& make install \
&& echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
&& rm -rf /tmp/*
RUN set -xe; \
\
docker-php-ext-install gd zip; \
curl -fsSL https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -o pickle.phar; \
chmod +x pickle.phar; \
mv pickle.phar /usr/local/bin/pickle; \
pickle install redis; \
pickle install igbinary; \
pickle install xdebug@3.1.5; \
docker-php-ext-enable opcache redis igbinary imagick gd; \
docker-php-source delete; \
pickle install xdebug; \
docker-php-ext-enable imagick opcache redis imagick igbinary gd; \
docker-php-source delete;
RUN set -xe; \
\
# for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
sed 's!=NONE/!=!g' /usr/local/etc/php-fpm.conf.default | tee /usr/local/etc/php-fpm.conf > /dev/null; \
cp /usr/local/etc/php-fpm.d/www.conf.default /usr/local/etc/php-fpm.d/www.conf; \
Expand All @@ -120,8 +131,7 @@ RUN set -xe; \
echo 'pm.min_spare_servers = 2'; \
echo 'pm.max_spare_servers = 5'; \
echo 'pm.status_path = /status'; \
} | tee /usr/local/etc/php-fpm.d/zz-docker.conf; \
/usr/local/bin/docker-layer-clean
} | tee /usr/local/etc/php-fpm.d/zz-docker.conf;

## configure php extensions
# hadolint ignore=DL4006,SC2086,DL3003
Expand All @@ -133,24 +143,30 @@ RUN set -xe; \
COMPOSER_DOWNLOAD_LATEST=$(curl -s https://api.github.com/repos/composer/composer/releases/latest | jq --raw-output '.assets[] | .browser_download_url' | head -n 1) ; \
docker-package-download -o /usr/local/bin/composer ${COMPOSER_DOWNLOAD_LATEST}; \
chmod +x /usr/local/bin/composer; \
composer selfupdate; \
composer selfupdate;
RUN set -xe; \
\
################################################
## install Composer 1
################################################
docker-package-download -o /usr/local/bin/composer1 https://getcomposer.org/composer-1.phar; \
chmod +x /usr/local/bin/composer1; \
composer1 selfupdate; \
composer1 selfupdate;
RUN set -xe; \
\
################################################
## install magerun
################################################
curl -s -f -L -o /usr/local/bin/magerun https://files.magerun.net/n98-magerun.phar; \
chmod +x /usr/local/bin/magerun; \
chmod +x /usr/local/bin/magerun;
RUN set -xe; \
\
################################################
## install magerun2
################################################
curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \
chmod +x /usr/local/bin/magerun2; \
/usr/local/bin/docker-layer-clean
/usr/local/bin/docker-layer-clean;

WORKDIR /var/www/html
ENTRYPOINT ["docker-entrypoint"]
Expand Down
44 changes: 30 additions & 14 deletions src/8.0/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM openmage/php-base:bullseye-latest AS php
FROM openmage/php-base:bookworm-latest AS php

COPY FS /

ARG PHP_RUNTIME_REQUIREMENTS="jq curl libcurl3-gnutls ca-certificates libedit2 libgmp-dev libfreetype6 libltdl7 libmcrypt4 sqlite3 libpng16-16 libzip4 libfcgi-bin libtidy5deb1 libsodium23 libonig5 cron vim.tiny php-xdebug zip"
ARG PHP_RUNTIME_REQUIREMENTS_EXTRA=""
ARG PHP_BUILD_REQUIREMENTS="build-essential dpkg-dev automake autoconf libtool file g++ gcc libc-dev make pkg-config re2c libxml2-dev libcurl4-gnutls-dev libtidy-dev libsqlite3-dev libssl-dev libxml2-dev zlib1g-dev libpng-dev libreadline6-dev libfreetype6-dev libmcrypt-dev libedit-dev libltdl-dev libxslt-dev libzip-dev libsodium-dev libonig-dev gnupg2 argon2 libargon2-0 libargon2-dev libzip-dev"
ARG PHP_BUILD_REQUIREMENTS="build-essential curl dpkg-dev automake autoconf libtool file g++ gcc libc-dev make pkg-config re2c libxml2-dev libcurl4-gnutls-dev libtidy-dev libsqlite3-dev libssl-dev libxml2-dev zlib1g-dev libpng-dev liblzf-dev libreadline6-dev libfreetype6-dev libmcrypt-dev libedit-dev libltdl-dev libxslt-dev libzip-dev libsodium-dev libonig-dev gnupg2 argon2 libargon2-0 libargon2-dev libzip-dev"
ARG PHP_BUILD_REQUIREMENTS_EXTRA=""
ARG PHP_PECL_REQUIREMENTS="redis igbinary"
ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl"
Expand All @@ -26,6 +26,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \

### configure php
# hadolint ignore=DL4006,SC2039,DL3003
# hadolint ignore=DL4006,SC2039,DL3003
RUN set -xe; \
\
chmod 755 /usr/local/bin/docker-entrypoint; \
Expand Down Expand Up @@ -82,18 +83,28 @@ RUN set -xe; \
${PHP_CONFIGURE_ARGS_FPM:-} \
; \
make -j "$(nproc)"; \
make install; \
mkdir -p /usr/src/php/ext/imagick; \
curl -fsSL https://github.com/Imagick/imagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz | tar xvz -C "/usr/src/php/ext/imagick" --strip 1; \
docker-php-ext-install imagick gd zip; \
make install;
RUN curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
&& tar --strip-components=1 -xf /tmp/imagick.tar.gz \
&& phpize \
&& ./configure \
&& make \
&& make install \
&& echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
&& rm -rf /tmp/*
RUN set -xe; \
\
docker-php-ext-install gd zip; \
curl -fsSL https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -o pickle.phar; \
chmod +x pickle.phar; \
mv pickle.phar /usr/local/bin/pickle; \
pickle install redis; \
pickle install igbinary; \
pickle install xdebug; \
docker-php-ext-enable opcache redis igbinary imagick gd; \
docker-php-source delete; \
docker-php-ext-enable imagick opcache redis imagick igbinary gd; \
docker-php-source delete;
RUN set -xe; \
\
# for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
sed 's!=NONE/!=!g' /usr/local/etc/php-fpm.conf.default | tee /usr/local/etc/php-fpm.conf > /dev/null; \
cp /usr/local/etc/php-fpm.d/www.conf.default /usr/local/etc/php-fpm.d/www.conf; \
Expand All @@ -120,8 +131,7 @@ RUN set -xe; \
echo 'pm.min_spare_servers = 2'; \
echo 'pm.max_spare_servers = 5'; \
echo 'pm.status_path = /status'; \
} | tee /usr/local/etc/php-fpm.d/zz-docker.conf; \
/usr/local/bin/docker-layer-clean
} | tee /usr/local/etc/php-fpm.d/zz-docker.conf;

## configure php extensions
# hadolint ignore=DL4006,SC2086,DL3003
Expand All @@ -133,24 +143,30 @@ RUN set -xe; \
COMPOSER_DOWNLOAD_LATEST=$(curl -s https://api.github.com/repos/composer/composer/releases/latest | jq --raw-output '.assets[] | .browser_download_url' | head -n 1) ; \
docker-package-download -o /usr/local/bin/composer ${COMPOSER_DOWNLOAD_LATEST}; \
chmod +x /usr/local/bin/composer; \
composer selfupdate; \
composer selfupdate;
RUN set -xe; \
\
################################################
## install Composer 1
################################################
docker-package-download -o /usr/local/bin/composer1 https://getcomposer.org/composer-1.phar; \
chmod +x /usr/local/bin/composer1; \
composer1 selfupdate; \
composer1 selfupdate;
RUN set -xe; \
\
################################################
## install magerun
################################################
curl -s -f -L -o /usr/local/bin/magerun https://files.magerun.net/n98-magerun.phar; \
chmod +x /usr/local/bin/magerun; \
chmod +x /usr/local/bin/magerun;
RUN set -xe; \
\
################################################
## install magerun2
################################################
curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \
chmod +x /usr/local/bin/magerun2; \
/usr/local/bin/docker-layer-clean
/usr/local/bin/docker-layer-clean;

WORKDIR /var/www/html
ENTRYPOINT ["docker-entrypoint"]
Expand Down
42 changes: 29 additions & 13 deletions src/8.1/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY FS /

ARG PHP_RUNTIME_REQUIREMENTS="jq curl libcurl3-gnutls ca-certificates libedit2 libgmp-dev libfreetype6 libltdl7 libmcrypt4 sqlite3 libpng16-16 libzip4 libfcgi-bin libtidy5deb1 libsodium23 libonig5 cron vim.tiny php-xdebug zip"
ARG PHP_RUNTIME_REQUIREMENTS_EXTRA=""
ARG PHP_BUILD_REQUIREMENTS="build-essential dpkg-dev automake autoconf libtool file g++ gcc libc-dev make pkg-config re2c libxml2-dev libcurl4-gnutls-dev libtidy-dev libsqlite3-dev libssl-dev libxml2-dev zlib1g-dev libpng-dev liblzf-dev libreadline6-dev libfreetype6-dev libmcrypt-dev libedit-dev libltdl-dev libxslt-dev libzip-dev libsodium-dev libonig-dev gnupg2 argon2 libargon2-0 libargon2-dev libzip-dev"
ARG PHP_BUILD_REQUIREMENTS="build-essential curl dpkg-dev automake autoconf libtool file g++ gcc libc-dev make pkg-config re2c libxml2-dev libcurl4-gnutls-dev libtidy-dev libsqlite3-dev libssl-dev libxml2-dev zlib1g-dev libpng-dev liblzf-dev libreadline6-dev libfreetype6-dev libmcrypt-dev libedit-dev libltdl-dev libxslt-dev libzip-dev libsodium-dev libonig-dev gnupg2 argon2 libargon2-0 libargon2-dev libzip-dev"
ARG PHP_BUILD_REQUIREMENTS_EXTRA=""
ARG PHP_PECL_REQUIREMENTS="redis igbinary"
ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl"
Expand All @@ -26,6 +26,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \

### configure php
# hadolint ignore=DL4006,SC2039,DL3003
# hadolint ignore=DL4006,SC2039,DL3003
RUN set -xe; \
\
chmod 755 /usr/local/bin/docker-entrypoint; \
Expand Down Expand Up @@ -82,18 +83,28 @@ RUN set -xe; \
${PHP_CONFIGURE_ARGS_FPM:-} \
; \
make -j "$(nproc)"; \
make install; \
mkdir -p /usr/src/php/ext/imagick; \
curl -fsSL https://github.com/Imagick/imagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz | tar xvz -C "/usr/src/php/ext/imagick" --strip 1; \
docker-php-ext-install imagick gd zip; \
make install;
RUN curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
&& tar --strip-components=1 -xf /tmp/imagick.tar.gz \
&& phpize \
&& ./configure \
&& make \
&& make install \
&& echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
&& rm -rf /tmp/*
RUN set -xe; \
\
docker-php-ext-install gd zip; \
curl -fsSL https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -o pickle.phar; \
chmod +x pickle.phar; \
mv pickle.phar /usr/local/bin/pickle; \
pickle install redis; \
pickle install igbinary; \
pickle install xdebug; \
docker-php-ext-enable opcache redis igbinary imagick gd; \
docker-php-source delete; \
docker-php-ext-enable imagick opcache redis imagick igbinary gd; \
docker-php-source delete;
RUN set -xe; \
\
# for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
sed 's!=NONE/!=!g' /usr/local/etc/php-fpm.conf.default | tee /usr/local/etc/php-fpm.conf > /dev/null; \
cp /usr/local/etc/php-fpm.d/www.conf.default /usr/local/etc/php-fpm.d/www.conf; \
Expand All @@ -120,8 +131,7 @@ RUN set -xe; \
echo 'pm.min_spare_servers = 2'; \
echo 'pm.max_spare_servers = 5'; \
echo 'pm.status_path = /status'; \
} | tee /usr/local/etc/php-fpm.d/zz-docker.conf; \
/usr/local/bin/docker-layer-clean
} | tee /usr/local/etc/php-fpm.d/zz-docker.conf;

## configure php extensions
# hadolint ignore=DL4006,SC2086,DL3003
Expand All @@ -133,24 +143,30 @@ RUN set -xe; \
COMPOSER_DOWNLOAD_LATEST=$(curl -s https://api.github.com/repos/composer/composer/releases/latest | jq --raw-output '.assets[] | .browser_download_url' | head -n 1) ; \
docker-package-download -o /usr/local/bin/composer ${COMPOSER_DOWNLOAD_LATEST}; \
chmod +x /usr/local/bin/composer; \
composer selfupdate; \
composer selfupdate;
RUN set -xe; \
\
################################################
## install Composer 1
################################################
docker-package-download -o /usr/local/bin/composer1 https://getcomposer.org/composer-1.phar; \
chmod +x /usr/local/bin/composer1; \
composer1 selfupdate; \
composer1 selfupdate;
RUN set -xe; \
\
################################################
## install magerun
################################################
curl -s -f -L -o /usr/local/bin/magerun https://files.magerun.net/n98-magerun.phar; \
chmod +x /usr/local/bin/magerun; \
chmod +x /usr/local/bin/magerun;
RUN set -xe; \
\
################################################
## install magerun2
################################################
curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \
chmod +x /usr/local/bin/magerun2; \
/usr/local/bin/docker-layer-clean
/usr/local/bin/docker-layer-clean;

WORKDIR /var/www/html
ENTRYPOINT ["docker-entrypoint"]
Expand Down
Loading
Loading