Skip to content

Commit 2bbfc65

Browse files
committed
Switch to debian:bookworm-slim image
Debian Bullseye is EOL.
1 parent f1c9d8a commit 2bbfc65

File tree

3 files changed

+1
-102
lines changed

3 files changed

+1
-102
lines changed

.github/workflows/build.yml

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

0 commit comments

Comments
 (0)