From 4ec5a2ab4922c9daa278686123dd111678d728dc Mon Sep 17 00:00:00 2001 From: Chingis S Date: Sat, 24 Oct 2026 12:25:22 +0700 Subject: [PATCH 1/2] Verify Brotli fixes in rebuilt images Check the final image for CVE-2026-111497 before publication using the shared verifier. Refresh inherited packages where needed, accept verified distribution backports, and keep package installation free of Brotli version constraints. --- .github/workflows/workflow.yml | 17 ++++++++++++++++- Dockerfile | 3 ++- Makefile | 5 +++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b6ae5a4..1664782 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,6 +1,7 @@ name: Build docker image on: + pull_request: push: branches: - master @@ -28,24 +29,38 @@ jobs: steps: - uses: actions/checkout@v5 - uses: docker/login-action@v3 + if: github.event_name == 'push' with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: build and push + id: brotli-image env: ADMINER_VER: ${{ env.ADMINER6 }} ARCH: ${{ matrix.arch }} run: | make make test - make push + echo "image=$(make --no-print-directory -s image-ref)" >> "$GITHUB_OUTPUT" + - name: Verify Brotli security fixes + uses: wodby/images/.github/actions/check-brotli@4d79323d1d62295e425a222e8cb23ccf843cbbea + with: + image: ${{ steps.brotli-image.outputs.image }} + - name: Push verified architecture image + if: github.event_name == 'push' + env: + ADMINER_VER: ${{ env.ADMINER6 }} + ARCH: ${{ matrix.arch }} + run: make push adminer-push: + if: github.event_name == 'push' runs-on: ubuntu-latest needs: - adminer-build steps: - uses: actions/checkout@v5 - uses: docker/login-action@v3 + if: github.event_name == 'push' with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/Dockerfile b/Dockerfile index d322d9c..c7a631b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,8 @@ ENV ADMINER_VER="${ADMINER_VER}" \ PHP_UPLOAD_MAX_FILESIZE="512M" RUN set -ex; \ - apt-get update && apt-get install -y --no-install-recommends \ + apt-get update && \ + apt-get install -y --no-install-recommends --only-upgrade libbrotli1 && apt-get install -y --no-install-recommends \ postgresql-client \ postgresql-server-dev-all; \ docker-php-ext-install mysqli pgsql pdo_mysql pdo_pgsql; \ diff --git a/Makefile b/Makefile index a823d8e..8c9754e 100644 --- a/Makefile +++ b/Makefile @@ -71,3 +71,8 @@ clean: -docker rm -f $(NAME) release: build push + +# Expose the exact tag built with the current version, variant and architecture. +.PHONY: image-ref +image-ref: + @printf '%s\n' "$(REPO):$(TAG)" From 00dfd928dfcc322bbd0ee799fedea644ee77a45c Mon Sep 17 00:00:00 2001 From: Chingis S Date: Sat, 24 Oct 2026 12:50:33 +0700 Subject: [PATCH 2/2] Keep package refresh without CVE-specific CI checks Remove the one-off Brotli verifier and its image-reference and workflow wiring. Retain the package refresh and any base-image or functional-test fixes required for rebuilt images. --- .github/workflows/workflow.yml | 17 +---------------- Makefile | 5 ----- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 1664782..b6ae5a4 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,7 +1,6 @@ name: Build docker image on: - pull_request: push: branches: - master @@ -29,38 +28,24 @@ jobs: steps: - uses: actions/checkout@v5 - uses: docker/login-action@v3 - if: github.event_name == 'push' with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: build and push - id: brotli-image env: ADMINER_VER: ${{ env.ADMINER6 }} ARCH: ${{ matrix.arch }} run: | make make test - echo "image=$(make --no-print-directory -s image-ref)" >> "$GITHUB_OUTPUT" - - name: Verify Brotli security fixes - uses: wodby/images/.github/actions/check-brotli@4d79323d1d62295e425a222e8cb23ccf843cbbea - with: - image: ${{ steps.brotli-image.outputs.image }} - - name: Push verified architecture image - if: github.event_name == 'push' - env: - ADMINER_VER: ${{ env.ADMINER6 }} - ARCH: ${{ matrix.arch }} - run: make push + make push adminer-push: - if: github.event_name == 'push' runs-on: ubuntu-latest needs: - adminer-build steps: - uses: actions/checkout@v5 - uses: docker/login-action@v3 - if: github.event_name == 'push' with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/Makefile b/Makefile index 8c9754e..a823d8e 100644 --- a/Makefile +++ b/Makefile @@ -71,8 +71,3 @@ clean: -docker rm -f $(NAME) release: build push - -# Expose the exact tag built with the current version, variant and architecture. -.PHONY: image-ref -image-ref: - @printf '%s\n' "$(REPO):$(TAG)"