Skip to content

Commit cb99f65

Browse files
featheredtoastfeatheredtoast
committed
FEATURE: introduce web_only images
web_only images do not install postgres or redis, minimizing image sizes for setups that do not require those components. release and dev images still install postgres and redis, but do it later in the process.
1 parent 64f31db commit cb99f65

File tree

4 files changed

+75
-3
lines changed

4 files changed

+75
-3
lines changed

‎.github/workflows/build.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ jobs:
6565
run: |
6666
ruby auto_build.rb base_slim_stable_${{ matrix.arch }}
6767
68+
- name: build web_only images for `main` branch
69+
working-directory: image
70+
run: |
71+
ruby auto_build.rb base_web_only_main_${{ matrix.arch }}
72+
73+
- name: build web_only images for `stable` branch
74+
working-directory: image
75+
run: |
76+
ruby auto_build.rb base_web_only_stable_${{ matrix.arch }}
77+
6878
- name: build release images for `main` branch
6979
working-directory: image
7080
run: |
@@ -83,6 +93,8 @@ jobs:
8393
8494
- name: tag release images
8595
run: |
96+
docker tag discourse/base:build_web_only_main_${{ matrix.arch }} discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-main-${{ matrix.arch }}
97+
docker tag discourse/base:build_web_only_stable_${{ matrix.arch }} discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable-${{ matrix.arch }}
8698
docker tag discourse/base:build_release_main_${{ matrix.arch }} discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}
8799
docker tag discourse/base:build_release_main_${{ matrix.arch }}_pg_15 discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}-pg-15
88100
docker tag discourse/base:build_release_stable_${{ matrix.arch }} discourse/base:2.0.${{ env.TIMESTAMP }}-stable-${{ matrix.arch }}
@@ -132,6 +144,8 @@ jobs:
132144
run: |
133145
docker login --username discoursebuild --password $DOCKERHUB_PASSWORD
134146
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-slim-${{ matrix.arch }}
147+
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-main-${{ matrix.arch }}
148+
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable-${{ matrix.arch }}
135149
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}
136150
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}-pg-15
137151
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-stable-${{ matrix.arch }}
@@ -163,6 +177,26 @@ jobs:
163177
-a discourse/base:2.0.${{ env.TIMESTAMP }}-slim-amd64 \
164178
-a discourse/base:2.0.${{ env.TIMESTAMP }}-slim-arm64
165179
180+
# Web-Only `main` timestamped
181+
docker manifest create discourse/base:2.0.${{ env.TIMESTAMP }}-web-only \
182+
-a discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-main-amd64 \
183+
-a discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-main-arm64
184+
185+
# Web-Only `main` release
186+
docker manifest create discourse/base:web-only \
187+
-a discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-main-amd64 \
188+
-a discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-main-arm64
189+
190+
# Web-Only `stable` timestamped
191+
docker manifest create discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable \
192+
-a discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable-amd64 \
193+
-a discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable-arm64
194+
195+
# Web-Only `stable` release
196+
docker manifest create discourse/base:web-only-stable \
197+
-a discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable-amd64 \
198+
-a discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable-arm64
199+
166200
# Full Discourse `main` branch timestamped
167201
docker manifest create discourse/base:2.0.${{ env.TIMESTAMP }} \
168202
-a discourse/base:2.0.${{ env.TIMESTAMP }}-main-amd64 \
@@ -200,6 +234,10 @@ jobs:
200234
201235
docker manifest push discourse/base:2.0.${{ env.TIMESTAMP }}-slim
202236
docker manifest push discourse/base:slim
237+
docker manifest push discourse/base:2.0.${{ env.TIMESTAMP }}-web-only
238+
docker manifest push discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable
239+
docker manifest push discourse/base:web-only
240+
docker manifest push discourse/base:web-only-stable
203241
docker manifest push discourse/base:2.0.${{ env.TIMESTAMP }}
204242
docker manifest push discourse/base:2.0.${{ env.TIMESTAMP }}-pg-15
205243
docker manifest push discourse/base:2.0.${{ env.TIMESTAMP }}-stable

‎image/auto_build.rb‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,31 @@
3737
"--platform linux/arm64 --target discourse_slim --build-arg=\"DISCOURSE_BRANCH=stable\"",
3838
use_cache: true,
3939
},
40+
base_web_only_main_amd64: {
41+
name: "base",
42+
tag: "discourse/base:build_web_only_main_amd64",
43+
extra_args: "--target discourse_web_only",
44+
use_cache: true,
45+
},
46+
base_web_only_stable_amd64: {
47+
name: "base",
48+
tag: "discourse/base:build_web_only_main_amd64",
49+
extra_args: "--target discourse_web_only --build-arg=\"DISCOURSE_BRANCH=stable\"",
50+
use_cache: true,
51+
},
52+
base_web_only_main_arm64: {
53+
name: "base",
54+
tag: "discourse/base:build_web_only_main_arm64",
55+
extra_args: "--platform linux/arm64 --target discourse_web_only",
56+
use_cache: true,
57+
},
58+
base_web_only_stable_arm64: {
59+
name: "base",
60+
tag: "discourse/base:build_web_only_stable_arm64",
61+
extra_args:
62+
"--platform linux/arm64 --target discourse_web_only --build-arg=\"DISCOURSE_BRANCH=stable\"",
63+
use_cache: true,
64+
},
4065
base_release_main_amd64: {
4166
name: "base",
4267
tag: "discourse/base:build_release_main_amd64",

‎image/base/Dockerfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ RUN --mount=type=tmpfs,target=/var/log \
9292
sh -c "test -f /sbin/initctl || ln -s /bin/true /sbin/initctl"; \
9393
apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install runit socat \
9494
libpq-dev postgresql-client-${PG_MAJOR} \
95-
postgresql-${PG_MAJOR} postgresql-contrib-${PG_MAJOR} postgresql-${PG_MAJOR}-pgvector \
9695
nodejs yarn &&\
9796
mkdir -p /etc/runit/1.d
9897

@@ -130,7 +129,6 @@ ADD install-jemalloc /tmp/install-jemalloc
130129
RUN /tmp/install-jemalloc
131130

132131
ADD install-redis /tmp/install-redis
133-
RUN /tmp/install-redis
134132

135133
ADD install-oxipng /tmp/install-oxipng
136134
RUN /tmp/install-oxipng
@@ -168,7 +166,7 @@ RUN install -dm 0755 -o discourse -g discourse /var/www/discourse &&\
168166
sudo -u discourse git clone --branch $DISCOURSE_BRANCH --filter=tree:0 https://github.com/discourse/discourse.git /var/www/discourse &&\
169167
gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' /var/www/discourse/Gemfile.lock)
170168

171-
FROM discourse_slim AS discourse_release
169+
FROM discourse_slim AS discourse_web_only
172170
ENV RAILS_ENV=production
173171

174172
RUN cd /var/www/discourse &&\
@@ -181,3 +179,9 @@ RUN cd /var/www/discourse &&\
181179

182180
RUN cd /var/www/discourse &&\
183181
sudo -u discourse /bin/bash -c 'if [ -f yarn.lock ]; then yarn install --frozen-lockfile && yarn cache clean; else pnpm install --frozen-lockfile; fi'
182+
183+
FROM discourse_web_only AS discourse_release
184+
RUN --mount=type=tmpfs,target=/var/log \
185+
apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
186+
postgresql-${PG_MAJOR} postgresql-contrib-${PG_MAJOR} postgresql-${PG_MAJOR}-pgvector
187+
RUN /tmp/install-redis

‎image/discourse_dev/Dockerfile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ FROM discourse/base:$from_tag
1313

1414
#LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\""
1515

16+
# Install Postgres and Redis
17+
RUN --mount=type=tmpfs,target=/var/log \
18+
postgresql-${PG_MAJOR} postgresql-contrib-${PG_MAJOR} postgresql-${PG_MAJOR}-pgvector \
19+
RUN /tmp/install-redis
20+
1621
# Remove the code added on base image
1722
RUN rm -rf /var/www/*
1823

0 commit comments

Comments
 (0)