From 4c58e2b75bb341f362ff0d4d29af350b785cdee0 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Thu, 22 Aug 2024 10:57:56 +0800 Subject: [PATCH] Switch to debian:bookworm-slim image (#831) Debian Bullseye is EOL. --- .github/workflows/build.yml | 86 ----------------------------- image/auto_build.rb | 15 ----- image/base/slim.Dockerfile | 2 +- image/discourse_test/Dockerfile | 2 +- image/discourse_test/install-chrome | 2 +- 5 files changed, 3 insertions(+), 104 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c4294d..f35848c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,51 +105,6 @@ jobs: run: | docker tag discourse/base:release${{ steps.arch-helper.outputs.arch_postfix_dash }} discourse/base:aarch64 docker push discourse/base:aarch64 - base_bookworm: - runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }} - timeout-minutes: ${{ github.event_name != 'schedule' && 30 }} - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: build slim image - run: | - cd image && ruby auto_build.rb base_slim_bookworm - - name: tag slim images - id: tag-images - run: | - TAG=`date +%Y%m%d-%H%M` - echo "tag=$(echo $TAG)" >> $GITHUB_OUTPUT - docker tag discourse/base:build_slim_bookworm discourse/base:2.0.$TAG-slim-bookworm - docker tag discourse/base:build_slim_bookworm discourse/base:slim-bookworm - - name: build release image - run: | - cd image && ruby auto_build.rb base_bookworm - - name: tag release images - run: | - TAG=${{ steps.tag-images.outputs.tag }} - docker tag discourse/base:build_bookworm discourse/base:2.0.$TAG-bookworm - docker tag discourse/base:build_bookworm discourse/base:release-bookworm - - name: build test_build image - run: | - cd image && ruby auto_build.rb discourse_test_build_bookworm - - name: run specs - run: | - docker run --rm -e RUBY_ONLY=1 -e USE_TURBO=1 -e SKIP_PLUGINS=1 -e SKIP_LINT=1 discourse/discourse_test:build_bookworm - - name: Print summary - run: | - docker images discourse/base - - name: push to dockerhub - if: success() && (github.ref == 'refs/heads/main') - env: - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - run: | - TAG=${{ steps.tag-images.outputs.tag }} - docker login --username discoursebuild --password $DOCKERHUB_PASSWORD - docker push discourse/base:2.0.$TAG-slim-bookworm - docker push discourse/base:slim-bookworm - docker push discourse/base:2.0.$TAG-bookworm - docker push discourse/base:release-bookworm test: runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }} timeout-minutes: 30 @@ -191,47 +146,6 @@ jobs: docker push discourse/discourse_test:slim docker push discourse/discourse_test:slim-browsers docker push discourse/discourse_test:release - test_bookworm: - runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }} - timeout-minutes: 30 - needs: base_bookworm - defaults: - run: - working-directory: image/discourse_test - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: build discourse_test:slim-bookworm - run: | - docker buildx build . --load \ - --build-arg from_tag=slim-bookworm \ - --target base \ - --tag discourse/discourse_test:slim-bookworm - - name: build discourse_test:slim-browsers-bookworm - run: | - docker buildx build . --load \ - --build-arg from_tag=slim-bookworm \ - --target with_browsers \ - --tag discourse/discourse_test:slim-browsers-bookworm - - name: build discourse_test:release-bookworm - run: | - docker buildx build . --load \ - --build-arg from_tag=release-bookworm \ - --target release \ - --tag discourse/discourse_test:release-bookworm - - name: Print summary - run: | - docker images discourse/discourse_test - - name: push to dockerhub - if: success() && (github.ref == 'refs/heads/main') - env: - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - run: | - docker login --username discoursebuild --password $DOCKERHUB_PASSWORD - docker push discourse/discourse_test:slim-bookworm - docker push discourse/discourse_test:slim-browsers-bookworm - docker push discourse/discourse_test:release-bookworm dev: runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }} timeout-minutes: 30 diff --git a/image/auto_build.rb b/image/auto_build.rb index a3b80fa..9c57f6d 100644 --- a/image/auto_build.rb +++ b/image/auto_build.rb @@ -9,11 +9,6 @@ images = { tag: "discourse/base:build_slim", extra_args: "-f slim.Dockerfile", }, - base_slim_bookworm: { - name: "base", - tag: "discourse/base:build_slim_bookworm", - extra_args: "-f slim.Dockerfile --build-arg=\"DEBIAN_RELEASE=bookworm\"", - }, base_slim_arm64: { name: "base", tag: "discourse/base:build_slim_arm64", @@ -24,11 +19,6 @@ images = { tag: "discourse/base:build", extra_args: "-f release.Dockerfile", }, - base_bookworm: { - name: "base", - tag: "discourse/base:build_bookworm", - extra_args: "-f release.Dockerfile --build-arg=\"tag=build_slim_bookworm\"", - }, base_arm64: { name: "base", tag: "discourse/base:build_arm64", @@ -38,11 +28,6 @@ images = { name: "discourse_test", tag: "discourse/discourse_test:build", }, - discourse_test_build_bookworm: { - name: "discourse_test", - tag: "discourse/discourse_test:build_bookworm", - extra_args: "--build-arg=\"from_tag=build_bookworm\"", - }, discourse_test_build_arm64: { name: "discourse_test", tag: "discourse/discourse_test:build_arm64", diff --git a/image/base/slim.Dockerfile b/image/base/slim.Dockerfile index c7f2273..6f07355 100644 --- a/image/base/slim.Dockerfile +++ b/image/base/slim.Dockerfile @@ -1,7 +1,7 @@ # NAME: discourse/base # VERSION: release -ARG DEBIAN_RELEASE=bullseye +ARG DEBIAN_RELEASE=bookworm FROM debian:${DEBIAN_RELEASE}-slim ARG DEBIAN_RELEASE diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index 2bcab2f..bbfcd4e 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -17,7 +17,7 @@ RUN chown -R discourse . &&\ FROM base AS with_browsers -ENV TESTEM_DEFAULT_BROWSER Chromium +ENV TESTEM_DEFAULT_BROWSER Chrome ADD install-chrome /tmp/install-chrome RUN /tmp/install-chrome &&\ apt update &&\ diff --git a/image/discourse_test/install-chrome b/image/discourse_test/install-chrome index 8b9d24a..5b91277 100755 --- a/image/discourse_test/install-chrome +++ b/image/discourse_test/install-chrome @@ -10,5 +10,5 @@ else wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - &&\ echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\ apt update &&\ - apt install -y google-chrome-stable chromium-driver + apt install -y google-chrome-stable fi -- 2.25.1