Skip to content

Commit f0e507b

Browse files
committed
Upgrade base image to Debian Bookwork because bullseye is EOL
1 parent 6f7f62c commit f0e507b

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
arch: [amd64, arm64]
26-
timeout-minutes: ${{ (github.event_name != 'schedule' && 30) || ((matrix.arch == 'arm64' && 60) || 30) }}
26+
timeout-minutes: ${{ (github.event_name != 'schedule' && 45) || ((matrix.arch == 'arm64' && 60) || 45) }}
2727
steps:
2828
- name: Install Docker
2929
if: ${{ matrix.arch == 'arm64' }}
@@ -84,7 +84,7 @@ jobs:
8484
cd image && ruby auto_build.rb discourse_test_build${{ steps.arch-helper.outputs.arch_postfix_underscore }}
8585
- name: run specs
8686
run: |
87-
docker run --rm -e RUBY_ONLY=1 -e USE_TURBO=1 -e SKIP_PLUGINS=1 -e SKIP_LINT=1 discourse/discourse_test:build${{ steps.arch-helper.outputs.arch_postfix_underscore }}
87+
docker run --rm ${{ (matrix.arch == 'amd64' && '-e RUN_SYSTEM_TESTS=1') || '' }} -e RUBY_ONLY=1 -e USE_TURBO=1 -e SKIP_PLUGINS=1 -e SKIP_LINT=1 discourse/discourse_test:build${{ steps.arch-helper.outputs.arch_postfix_underscore }}
8888
- name: Print summary
8989
run: |
9090
docker images discourse/base

image/base/install-imagemagick

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,16 @@ IMAGE_MAGICK_HASH="d282117bc6d0e91ad1ad685d096623b96ed8e229f911c891d83277b350ef8
88
# We use debian, but GitHub CI is stuck on Ubuntu Bionic, so this must be compatible with both
99
LIBJPEGTURBO=$(cat /etc/issue | grep -qi Debian && echo 'libjpeg62-turbo libjpeg62-turbo-dev' || echo 'libjpeg-turbo8 libjpeg-turbo8-dev')
1010

11-
# Ubuntu 22.04/22.10 doesn't have libwebp6
12-
LIBWEBP=$(cat /etc/issue | grep -qi 'Ubuntu 22' && echo 'libwebp7' || echo 'libwebp6')
13-
1411
PREFIX=/usr/local
1512
WDIR=/tmp/imagemagick
1613

1714
# Install build deps
1815
apt -y -q remove imagemagick
1916
apt -y -q install git make gcc pkg-config autoconf curl g++ yasm cmake \
2017
libde265-0 libde265-dev ${LIBJPEGTURBO} x265 libx265-dev libtool \
21-
libpng16-16 libpng-dev ${LIBJPEGTURBO} ${LIBWEBP} libwebp-dev libgomp1 \
18+
libpng16-16 libpng-dev libwebp7 libwebp-dev libgomp1 \
2219
libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils librsvg2-dev \
23-
libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev
24-
25-
# Ubuntu doesn't like `bullseye-backports`
26-
if cat /etc/issue | grep -qi 'Ubuntu 22'; then
27-
apt -y install libheif1 libaom-dev libheif-dev
28-
else
29-
# Use backports instead of compiling it
30-
apt -y -q install -t bullseye-backports libheif1 libaom-dev libheif-dev
31-
fi
20+
libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev libheif1 libaom-dev libheif-dev
3221

3322
mkdir -p $WDIR
3423
cd $WDIR

image/base/slim.Dockerfile

Lines changed: 5 additions & 5 deletions
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
@@ -19,7 +19,6 @@ ENV PG_MAJOR=13 \
1919

2020
RUN echo 2.0.`date +%Y%m%d` > /VERSION
2121

22-
RUN echo 'deb http://deb.debian.org/debian bullseye-backports main' > /etc/apt/sources.list.d/bullseye-backports.list
2322
RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections
2423
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg sudo curl fping
2524
RUN sh -c "fping proxy && echo 'Acquire { Retries \"0\"; HTTP { Proxy \"http://proxy:3128\";}; };' > /etc/apt/apt.conf.d/40proxy && apt-get update || true"
@@ -31,9 +30,10 @@ ENV LC_ALL en_US.UTF-8
3130
ENV LANG en_US.UTF-8
3231
ENV LANGUAGE en_US.UTF-8
3332

34-
RUN curl https://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add -
35-
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" | \
36-
tee /etc/apt/sources.list.d/postgres.list
33+
RUN install -d /usr/share/postgresql-common/pgdg &&\
34+
curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc &&\
35+
echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt ${DEBIAN_RELEASE}-pgdg main" > /etc/apt/sources.list.d/pgdg.list
36+
3737
RUN curl --silent --location https://deb.nodesource.com/setup_18.x | sudo bash -
3838
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
3939
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list

0 commit comments

Comments
 (0)