From c180116ae3d4625821c06571d2f683e02c3d7713 Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Thu, 7 Dec 2023 11:09:19 +0000 Subject: [PATCH 1/2] Add php 8.3 to docker image --- dev/Docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/Docker/Dockerfile b/dev/Docker/Dockerfile index d4153da7..38617649 100644 --- a/dev/Docker/Dockerfile +++ b/dev/Docker/Dockerfile @@ -12,6 +12,7 @@ RUN source /root/.bashrc && phpenv install 7.2.34 && phpenv global 7.2.34 && sed RUN source /root/.bashrc && PHP_BUILD_INSTALL_EXTENSION="libsodium=1.0.7" phpenv install 7.4.29 && phpenv global 7.4.29 && sed -i 's/memory_limit = 128M/memory_limit = 1024M/' /root/.phpenv/versions/7.4.29/etc/php.ini && php --version RUN source /root/.bashrc && PHP_BUILD_CONFIGURE_OPTS="--with-sodium" phpenv install 8.1.6 && phpenv global 8.1.6 && sed -i 's/memory_limit = 128M/memory_limit = 1024M/' /root/.phpenv/versions/8.1.6/etc/php.ini && php --version RUN source /root/.bashrc && PHP_BUILD_CONFIGURE_OPTS="--with-sodium" phpenv install 8.2.2 && phpenv global 8.2.2 && sed -i 's/memory_limit = 128M/memory_limit = 1024M/' /root/.phpenv/versions/8.2.2/etc/php.ini && php --version +RUN source /root/.bashrc && PHP_BUILD_CONFIGURE_OPTS="--with-sodium" phpenv install 8.3.0 && phpenv global 8.3.0 && sed -i 's/memory_limit = 128M/memory_limit = 1024M/' /root/.phpenv/versions/8.3.0/etc/php.ini && php --version RUN source /root/.bashrc && wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --quiet && mv composer.phar /root/.phpenv/bin/composer2 && /root/.phpenv/bin/composer2 self-update --2 && /root/.phpenv/bin/composer2 self-update --2.2 -RUN source /root/.bashrc && wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --quiet && mv composer.phar /root/.phpenv/bin/composer1 && /root/.phpenv/bin/composer1 self-update --1 \ No newline at end of file +RUN source /root/.bashrc && wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --quiet && mv composer.phar /root/.phpenv/bin/composer1 && /root/.phpenv/bin/composer1 self-update --1 From 577dc40be1e0fcdb48ca1dbfd17c5654555ab966 Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Fri, 15 Dec 2023 09:50:39 +0000 Subject: [PATCH 2/2] Update dev docker image --- dev/Docker/docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/Docker/docker-compose.yml b/dev/Docker/docker-compose.yml index 470cf2c6..e647127c 100644 --- a/dev/Docker/docker-compose.yml +++ b/dev/Docker/docker-compose.yml @@ -23,7 +23,7 @@ services: m2451nodb: depends_on: - elasticsearch - image: ampco/ampersand-magento2-upgrade-patch-helper:latest + image: ampco/ampersand-magento2-upgrade-patch-helper:2023-11-07 platform: linux/amd64 container_name: uphelper-m2451nodb stdin_open: true @@ -44,7 +44,7 @@ services: m24nodb: depends_on: - elasticsearch - image: ampco/ampersand-magento2-upgrade-patch-helper:latest + image: ampco/ampersand-magento2-upgrade-patch-helper:2023-11-07 platform: linux/amd64 container_name: uphelper-m24nodb stdin_open: true @@ -66,7 +66,7 @@ services: depends_on: - elasticsearch - mysql57 - image: ampco/ampersand-magento2-upgrade-patch-helper:latest + image: ampco/ampersand-magento2-upgrade-patch-helper:2023-11-07 platform: linux/amd64 container_name: uphelper-m24 stdin_open: true @@ -87,7 +87,7 @@ services: m23: depends_on: - mysql57 - image: ampco/ampersand-magento2-upgrade-patch-helper:latest + image: ampco/ampersand-magento2-upgrade-patch-helper:2023-11-07 platform: linux/amd64 container_name: uphelper-m23 stdin_open: true @@ -108,7 +108,7 @@ services: m22: depends_on: - mysql57 - image: ampco/ampersand-magento2-upgrade-patch-helper:latest + image: ampco/ampersand-magento2-upgrade-patch-helper:2023-11-07 platform: linux/amd64 container_name: uphelper-m22 stdin_open: true