Skip to content

Commit 4c58e2b

Browse files
authored
Switch to debian:bookworm-slim image (#831)
Debian Bullseye is EOL.
1 parent 1d73232 commit 4c58e2b

File tree

5 files changed

+3
-104
lines changed

5 files changed

+3
-104
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -105,51 +105,6 @@ jobs:
105105
run: |
106106
docker tag discourse/base:release${{ steps.arch-helper.outputs.arch_postfix_dash }} discourse/base:aarch64
107107
docker push discourse/base:aarch64
108-
base_bookworm:
109-
runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }}
110-
timeout-minutes: ${{ github.event_name != 'schedule' && 30 }}
111-
steps:
112-
- uses: actions/checkout@v3
113-
with:
114-
fetch-depth: 1
115-
- name: build slim image
116-
run: |
117-
cd image && ruby auto_build.rb base_slim_bookworm
118-
- name: tag slim images
119-
id: tag-images
120-
run: |
121-
TAG=`date +%Y%m%d-%H%M`
122-
echo "tag=$(echo $TAG)" >> $GITHUB_OUTPUT
123-
docker tag discourse/base:build_slim_bookworm discourse/base:2.0.$TAG-slim-bookworm
124-
docker tag discourse/base:build_slim_bookworm discourse/base:slim-bookworm
125-
- name: build release image
126-
run: |
127-
cd image && ruby auto_build.rb base_bookworm
128-
- name: tag release images
129-
run: |
130-
TAG=${{ steps.tag-images.outputs.tag }}
131-
docker tag discourse/base:build_bookworm discourse/base:2.0.$TAG-bookworm
132-
docker tag discourse/base:build_bookworm discourse/base:release-bookworm
133-
- name: build test_build image
134-
run: |
135-
cd image && ruby auto_build.rb discourse_test_build_bookworm
136-
- name: run specs
137-
run: |
138-
docker run --rm -e RUBY_ONLY=1 -e USE_TURBO=1 -e SKIP_PLUGINS=1 -e SKIP_LINT=1 discourse/discourse_test:build_bookworm
139-
- name: Print summary
140-
run: |
141-
docker images discourse/base
142-
- name: push to dockerhub
143-
if: success() && (github.ref == 'refs/heads/main')
144-
env:
145-
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
146-
run: |
147-
TAG=${{ steps.tag-images.outputs.tag }}
148-
docker login --username discoursebuild --password $DOCKERHUB_PASSWORD
149-
docker push discourse/base:2.0.$TAG-slim-bookworm
150-
docker push discourse/base:slim-bookworm
151-
docker push discourse/base:2.0.$TAG-bookworm
152-
docker push discourse/base:release-bookworm
153108
test:
154109
runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }}
155110
timeout-minutes: 30
@@ -191,47 +146,6 @@ jobs:
191146
docker push discourse/discourse_test:slim
192147
docker push discourse/discourse_test:slim-browsers
193148
docker push discourse/discourse_test:release
194-
test_bookworm:
195-
runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }}
196-
timeout-minutes: 30
197-
needs: base_bookworm
198-
defaults:
199-
run:
200-
working-directory: image/discourse_test
201-
steps:
202-
- uses: actions/checkout@v3
203-
with:
204-
fetch-depth: 1
205-
- name: build discourse_test:slim-bookworm
206-
run: |
207-
docker buildx build . --load \
208-
--build-arg from_tag=slim-bookworm \
209-
--target base \
210-
--tag discourse/discourse_test:slim-bookworm
211-
- name: build discourse_test:slim-browsers-bookworm
212-
run: |
213-
docker buildx build . --load \
214-
--build-arg from_tag=slim-bookworm \
215-
--target with_browsers \
216-
--tag discourse/discourse_test:slim-browsers-bookworm
217-
- name: build discourse_test:release-bookworm
218-
run: |
219-
docker buildx build . --load \
220-
--build-arg from_tag=release-bookworm \
221-
--target release \
222-
--tag discourse/discourse_test:release-bookworm
223-
- name: Print summary
224-
run: |
225-
docker images discourse/discourse_test
226-
- name: push to dockerhub
227-
if: success() && (github.ref == 'refs/heads/main')
228-
env:
229-
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
230-
run: |
231-
docker login --username discoursebuild --password $DOCKERHUB_PASSWORD
232-
docker push discourse/discourse_test:slim-bookworm
233-
docker push discourse/discourse_test:slim-browsers-bookworm
234-
docker push discourse/discourse_test:release-bookworm
235149
dev:
236150
runs-on: ubuntu-20.04${{ ((github.event_name != 'schedule') && '-8core') || '' }}
237151
timeout-minutes: 30

image/auto_build.rb

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
tag: "discourse/base:build_slim",
1010
extra_args: "-f slim.Dockerfile",
1111
},
12-
base_slim_bookworm: {
13-
name: "base",
14-
tag: "discourse/base:build_slim_bookworm",
15-
extra_args: "-f slim.Dockerfile --build-arg=\"DEBIAN_RELEASE=bookworm\"",
16-
},
1712
base_slim_arm64: {
1813
name: "base",
1914
tag: "discourse/base:build_slim_arm64",
@@ -24,11 +19,6 @@
2419
tag: "discourse/base:build",
2520
extra_args: "-f release.Dockerfile",
2621
},
27-
base_bookworm: {
28-
name: "base",
29-
tag: "discourse/base:build_bookworm",
30-
extra_args: "-f release.Dockerfile --build-arg=\"tag=build_slim_bookworm\"",
31-
},
3222
base_arm64: {
3323
name: "base",
3424
tag: "discourse/base:build_arm64",
@@ -38,11 +28,6 @@
3828
name: "discourse_test",
3929
tag: "discourse/discourse_test:build",
4030
},
41-
discourse_test_build_bookworm: {
42-
name: "discourse_test",
43-
tag: "discourse/discourse_test:build_bookworm",
44-
extra_args: "--build-arg=\"from_tag=build_bookworm\"",
45-
},
4631
discourse_test_build_arm64: {
4732
name: "discourse_test",
4833
tag: "discourse/discourse_test:build_arm64",

image/base/slim.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NAME: discourse/base
22
# VERSION: release
33

4-
ARG DEBIAN_RELEASE=bullseye
4+
ARG DEBIAN_RELEASE=bookworm
55
FROM debian:${DEBIAN_RELEASE}-slim
66

77
ARG DEBIAN_RELEASE

image/discourse_test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN chown -R discourse . &&\
1717

1818
FROM base AS with_browsers
1919

20-
ENV TESTEM_DEFAULT_BROWSER Chromium
20+
ENV TESTEM_DEFAULT_BROWSER Chrome
2121
ADD install-chrome /tmp/install-chrome
2222
RUN /tmp/install-chrome &&\
2323
apt update &&\

image/discourse_test/install-chrome

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ else
1010
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - &&\
1111
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\
1212
apt update &&\
13-
apt install -y google-chrome-stable chromium-driver
13+
apt install -y google-chrome-stable
1414
fi

0 commit comments

Comments
 (0)