Skip to content

Commit 2f055ae

Browse files
committed
Avoid image confusion
[skip ci]
1 parent fecd84c commit 2f055ae

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/docker.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ jobs:
5555
uses: docker/build-push-action@v3
5656
with:
5757
target: build
58-
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
59-
cache-to: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache,mode=max
58+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
59+
cache-to: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache,mode=max
6060
context: .
6161
platforms: ${{ env.PLATFORMS }}
6262
push: true
6363
tags: |
64-
ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
64+
ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:binaries
6565
6666
- name: Build main monolith image
6767
if: github.ref_name == 'main'
6868
id: docker_build_monolith
6969
uses: docker/build-push-action@v3
7070
with:
71-
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
71+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
7272
context: .
7373
platforms: ${{ env.PLATFORMS }}
7474
push: true
@@ -137,7 +137,7 @@ jobs:
137137
id: docker_build_demo_pinecone
138138
uses: docker/build-push-action@v3
139139
with:
140-
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
140+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
141141
context: .
142142
file: ./build/docker/Dockerfile.demo-pinecone
143143
platforms: ${{ env.PLATFORMS }}
@@ -151,7 +151,7 @@ jobs:
151151
id: docker_build_demo_pinecone_release
152152
uses: docker/build-push-action@v3
153153
with:
154-
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
154+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
155155
context: .
156156
file: ./build/docker/Dockerfile.demo-pinecone
157157
platforms: ${{ env.PLATFORMS }}
@@ -197,7 +197,7 @@ jobs:
197197
id: docker_build_demo_yggdrasil
198198
uses: docker/build-push-action@v3
199199
with:
200-
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
200+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
201201
context: .
202202
file: ./build/docker/Dockerfile.demo-yggdrasil
203203
platforms: ${{ env.PLATFORMS }}
@@ -211,7 +211,7 @@ jobs:
211211
id: docker_build_demo_yggdrasil_release
212212
uses: docker/build-push-action@v3
213213
with:
214-
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache
214+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
215215
context: .
216216
file: ./build/docker/Dockerfile.demo-yggdrasil
217217
platforms: ${{ env.PLATFORMS }}

build/docker/Dockerfile.demo-pinecone

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#syntax=docker/dockerfile:1.2
22

3-
FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite:buildcache AS build
3+
FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite-monolith:binaries AS build
44

55
FROM alpine:latest
66
RUN apk --update --no-cache add curl

build/docker/Dockerfile.demo-yggdrasil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#syntax=docker/dockerfile:1.2
22

3-
FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite:buildcache AS build
3+
FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite-monolith:binaries AS build
44

55
FROM alpine:latest
66
LABEL org.opencontainers.image.title="Dendrite (Yggdrasil demo)"

build/docker/images-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ TAG=${1:-latest}
66

77
echo "Building tag '${TAG}'"
88

9-
docker build -t ghcr.io/element-hq/dendrite:buildcache --target build .
9+
docker build -t ghcr.io/element-hq/dendrite-monolith:binaries --target build .
1010

1111
docker build -t ghcr.io/element-hq/dendrite-monolith:${TAG} .
1212

0 commit comments

Comments
 (0)