From fcfe0867472a0048feb4a75ee504384f74f2b64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Sun, 8 Nov 2026 20:07:57 +0100 Subject: [PATCH] CI: push images to Docker Hub The build job only ran make build and never pushed, so Docker Hub still serves the 2020 images and docker-compose.yml points at dockette/devstack:php85-fpm, which was never published. Build apache, php85-fpm and nodejs through the shared workflow and push them on master; pull requests build without pushing. nodejs stays amd64-only because its Dockerfile downloads the linux-x64 Node.js build. --- .github/workflows/docker.yml | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 63b5558..a39ceac 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -29,17 +29,28 @@ jobs: build: name: "Build" needs: ["test"] - runs-on: "ubuntu-latest" - - steps: - - name: "Checkout" - uses: actions/checkout@v7 - - - name: "Set up Docker Buildx" - uses: docker/setup-buildx-action@v4 - - - name: "Build selected images" - run: "make build" + uses: dockette/.github/.github/workflows/docker.yml@master + secrets: inherit + with: + image: "dockette/devstack" + tag: "${{ matrix.tag }}" + context: "${{ matrix.context }}" + platforms: "${{ matrix.platforms }}" + push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }} + strategy: + fail-fast: false + matrix: + include: + - tag: apache + context: apache + platforms: linux/amd64,linux/arm64 + - tag: php85-fpm + context: php/8.5-fpm + platforms: linux/amd64,linux/arm64 + # the Dockerfile downloads the linux-x64 Node.js build + - tag: nodejs + context: nodejs + platforms: linux/amd64 docs: name: "Docs"