From bb97f64735dbd51f9b9b7986d107bb0fc67f4358 Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Fri, 7 Aug 2026 10:40:56 +0200 Subject: [PATCH 1/2] Migrate CI Docker images to GitHub Container Registry The michielgerritsen/magento-project-community-edition images have moved to ghcr.io/controlaltdelete-nl/magento2-in-a-box/magento-project-community-edition. --- .github/workflows/magento-integration-tests.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/release-actions.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/magento-integration-tests.yml b/.github/workflows/magento-integration-tests.yml index b45c446..29bc143 100644 --- a/.github/workflows/magento-integration-tests.yml +++ b/.github/workflows/magento-integration-tests.yml @@ -34,7 +34,7 @@ jobs: fetch-depth: 0 - name: Start Docker - run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} + run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} - name: Upload our code into the docker container run: docker cp "$(pwd)" magento-project-community-edition:/data/extensions/ diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 9be608a..37bf50a 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -34,7 +34,7 @@ jobs: path: module-src - name: Start Docker - run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} + run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} - name: Extract branch name id: extract_branch diff --git a/.github/workflows/release-actions.yml b/.github/workflows/release-actions.yml index b878e3a..84c669f 100644 --- a/.github/workflows/release-actions.yml +++ b/.github/workflows/release-actions.yml @@ -35,7 +35,7 @@ jobs: fetch-depth: 0 - name: Start Docker - run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} + run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} - name: Upload our code into the docker container run: docker cp "$(pwd)" magento-project-community-edition:/data/extensions/ From a62c0cb47f70c3b9b82f7ec6f868e3685db3079c Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Fri, 7 Aug 2026 11:03:15 +0200 Subject: [PATCH 2/2] Add Mage-OS to the CI matrix The GHCR registry also publishes Mage-OS images, as a separate package (mage-os-community-edition) rather than extra tags on the Magento one. The image name therefore becomes a matrix value: MAGENTO_VERSION is replaced by IMAGE and IMAGE_VERSION, which together form the full tag. Adds a Mage-OS 3.3.0 leg on PHP 8.4 to every matrix. --- .github/workflows/magento-integration-tests.yml | 11 ++++++++--- .github/workflows/phpstan.yml | 11 ++++++++--- .github/workflows/release-actions.yml | 11 ++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.github/workflows/magento-integration-tests.yml b/.github/workflows/magento-integration-tests.yml index 29bc143..10c62d3 100644 --- a/.github/workflows/magento-integration-tests.yml +++ b/.github/workflows/magento-integration-tests.yml @@ -24,9 +24,14 @@ jobs: matrix: include: - PHP_VERSION: php74-fpm - MAGENTO_VERSION: 2.3.7-p4 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.3.7-p4 - PHP_VERSION: php82-fpm - MAGENTO_VERSION: 2.4.6-p12 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.4.6-p12 + - PHP_VERSION: php84-fpm + IMAGE: mage-os-community-edition + IMAGE_VERSION: mage-os3.3.0 steps: - uses: actions/checkout@v5 @@ -34,7 +39,7 @@ jobs: fetch-depth: 0 - name: Start Docker - run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} + run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/${{ matrix.IMAGE }}:${{ matrix.PHP_VERSION }}-${{ matrix.IMAGE_VERSION }} - name: Upload our code into the docker container run: docker cp "$(pwd)" magento-project-community-edition:/data/extensions/ diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 37bf50a..52d3a44 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -20,9 +20,14 @@ jobs: matrix: include: - PHP_VERSION: php74-fpm - MAGENTO_VERSION: 2.3.7-p4 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.3.7-p4 - PHP_VERSION: php82-fpm - MAGENTO_VERSION: 2.4.6-p12 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.4.6-p12 + - PHP_VERSION: php84-fpm + IMAGE: mage-os-community-edition + IMAGE_VERSION: mage-os3.3.0 permissions: contents: read @@ -34,7 +39,7 @@ jobs: path: module-src - name: Start Docker - run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} + run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/${{ matrix.IMAGE }}:${{ matrix.PHP_VERSION }}-${{ matrix.IMAGE_VERSION }} - name: Extract branch name id: extract_branch diff --git a/.github/workflows/release-actions.yml b/.github/workflows/release-actions.yml index 84c669f..6e9b9bb 100644 --- a/.github/workflows/release-actions.yml +++ b/.github/workflows/release-actions.yml @@ -25,9 +25,14 @@ jobs: matrix: include: - PHP_VERSION: php74-fpm - MAGENTO_VERSION: 2.3.7-p4 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.3.7-p4 - PHP_VERSION: php82-fpm - MAGENTO_VERSION: 2.4.6-p12 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.4.6-p12 + - PHP_VERSION: php84-fpm + IMAGE: mage-os-community-edition + IMAGE_VERSION: mage-os3.3.0 steps: - uses: actions/checkout@v5 @@ -35,7 +40,7 @@ jobs: fetch-depth: 0 - name: Start Docker - run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} + run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/${{ matrix.IMAGE }}:${{ matrix.PHP_VERSION }}-${{ matrix.IMAGE_VERSION }} - name: Upload our code into the docker container run: docker cp "$(pwd)" magento-project-community-edition:/data/extensions/