Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ jobs:
run: |
ruby auto_build.rb base_release_main_${{ matrix.arch }}

# Temporarily build images with PG 15 so that we can ship the changes to the postgres templates in the same PR.
- name: build release images for `main` branch with PG 15
working-directory: image
run: |
ruby auto_build.rb base_release_main_${{ matrix.arch }}_pg_15

- name: build release images for `stable` branch
working-directory: image
run: |
Expand All @@ -96,7 +90,6 @@ jobs:
docker tag discourse/base:build_web_only_main_${{ matrix.arch }} discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-main-${{ matrix.arch }}
docker tag discourse/base:build_web_only_stable_${{ matrix.arch }} discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable-${{ matrix.arch }}
docker tag discourse/base:build_release_main_${{ matrix.arch }} discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}
docker tag discourse/base:build_release_main_${{ matrix.arch }}_pg_15 discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}-pg-15
docker tag discourse/base:build_release_stable_${{ matrix.arch }} discourse/base:2.0.${{ env.TIMESTAMP }}-stable-${{ matrix.arch }}

- name: build test_build image for `main` branch
Expand Down Expand Up @@ -151,7 +144,6 @@ jobs:
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-main-${{ matrix.arch }}
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-web-only-stable-${{ matrix.arch }}
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}-pg-15
docker push discourse/base:2.0.${{ env.TIMESTAMP }}-stable-${{ matrix.arch }}
docker push discourse/discourse_dev:${{ env.TIMESTAMP }}-${{ matrix.arch }}

Expand Down Expand Up @@ -241,11 +233,6 @@ jobs:
discourse/base:2.0.${{ env.TIMESTAMP }}-main-amd64 \
discourse/base:2.0.${{ env.TIMESTAMP }}-main-arm64

# Full Discourse `main` branch timestamped with PG 15
docker buildx imagetools create -t discourse/base:2.0.${{ env.TIMESTAMP }}-pg-15 \
discourse/base:2.0.${{ env.TIMESTAMP }}-main-amd64-pg-15 \
discourse/base:2.0.${{ env.TIMESTAMP }}-main-arm64-pg-15

# Full Discourse `stable` branch timestamped
docker buildx imagetools create -t discourse/base:2.0.${{ env.TIMESTAMP }}-stable \
discourse/base:2.0.${{ env.TIMESTAMP }}-stable-amd64 \
Expand Down
14 changes: 0 additions & 14 deletions image/auto_build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,27 +68,13 @@
extra_args: "--build-arg=\"DISCOURSE_BRANCH=main\" --target discourse_release",
use_cache: true,
},
base_release_main_amd64_pg_15: {
name: "base",
tag: "discourse/base:build_release_main_amd64_pg_15",
extra_args:
"--build-arg=\"DISCOURSE_BRANCH=main\" --target discourse_release --build-arg PG_MAJOR=15",
use_cache: true,
},
base_release_main_arm64: {
name: "base",
tag: "discourse/base:build_release_main_arm64",
extra_args:
"--platform linux/arm64 --build-arg=\"DISCOURSE_BRANCH=main\" --target discourse_release",
use_cache: true,
},
base_release_main_arm64_pg_15: {
name: "base",
tag: "discourse/base:build_release_main_arm64_pg_15",
extra_args:
"--build-arg=\"DISCOURSE_BRANCH=main\" --target discourse_release --build-arg PG_MAJOR=15",
use_cache: true,
},
base_release_stable_amd64: {
name: "base",
tag: "discourse/base:build_release_stable_amd64",
Expand Down
Loading