lovely-projects/dendrite
lovely-projects/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-03-14 14:15:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid image confusion

Browse source 
[skip ci]
This commit is contained in:
Till Faelligen 2024-12-18 12:40:32 +01:00
parent fecd84ce79
commit 2f055ae8c9
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.github/workflows/docker.yml vendored
View file

@ -55,20 +55,20 @@ jobs:
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
target: build target: build
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
cache-to: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache,mode=max cache-to: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache,mode=max
context: . context: .
platforms: ${{ env.PLATFORMS }} platforms: ${{ env.PLATFORMS }}
push: true push: true
tags: | tags: |
ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:binaries
- name: Build main monolith image - name: Build main monolith image
if: github.ref_name == 'main' if: github.ref_name == 'main'
id: docker_build_monolith id: docker_build_monolith
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
context: . context: .
platforms: ${{ env.PLATFORMS }} platforms: ${{ env.PLATFORMS }}
push: true push: true
@ -137,7 +137,7 @@ jobs:
id: docker_build_demo_pinecone id: docker_build_demo_pinecone
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
context: . context: .
file: ./build/docker/Dockerfile.demo-pinecone file: ./build/docker/Dockerfile.demo-pinecone
platforms: ${{ env.PLATFORMS }} platforms: ${{ env.PLATFORMS }}
@ -151,7 +151,7 @@ jobs:
id: docker_build_demo_pinecone_release id: docker_build_demo_pinecone_release
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
context: . context: .
file: ./build/docker/Dockerfile.demo-pinecone file: ./build/docker/Dockerfile.demo-pinecone
platforms: ${{ env.PLATFORMS }} platforms: ${{ env.PLATFORMS }}
@ -197,7 +197,7 @@ jobs:
id: docker_build_demo_yggdrasil id: docker_build_demo_yggdrasil
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
context: . context: .
file: ./build/docker/Dockerfile.demo-yggdrasil file: ./build/docker/Dockerfile.demo-yggdrasil
platforms: ${{ env.PLATFORMS }} platforms: ${{ env.PLATFORMS }}
@ -211,7 +211,7 @@ jobs:
id: docker_build_demo_yggdrasil_release id: docker_build_demo_yggdrasil_release
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite:buildcache cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
context: . context: .
file: ./build/docker/Dockerfile.demo-yggdrasil file: ./build/docker/Dockerfile.demo-yggdrasil
platforms: ${{ env.PLATFORMS }} platforms: ${{ env.PLATFORMS }}

2
build/docker/Dockerfile.demo-pinecone
View file

@ -1,6 +1,6 @@
#syntax=docker/dockerfile:1.2 #syntax=docker/dockerfile:1.2
FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite:buildcache AS build FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite-monolith:binaries AS build
FROM alpine:latest FROM alpine:latest
RUN apk --update --no-cache add curl RUN apk --update --no-cache add curl

2
build/docker/Dockerfile.demo-yggdrasil
View file

@ -1,6 +1,6 @@
#syntax=docker/dockerfile:1.2 #syntax=docker/dockerfile:1.2
FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite:buildcache AS build FROM --platform=${BUILDPLATFORM} ghcr.io/element-hq/dendrite-monolith:binaries AS build
FROM alpine:latest FROM alpine:latest
LABEL org.opencontainers.image.title="Dendrite (Yggdrasil demo)" LABEL org.opencontainers.image.title="Dendrite (Yggdrasil demo)"

2
build/docker/images-build.sh
View file

@ -6,7 +6,7 @@ TAG=${1:-latest}
echo "Building tag '${TAG}'" echo "Building tag '${TAG}'"
docker build -t ghcr.io/element-hq/dendrite:buildcache --target build . docker build -t ghcr.io/element-hq/dendrite-monolith:binaries --target build .
docker build -t ghcr.io/element-hq/dendrite-monolith:${TAG} . docker build -t ghcr.io/element-hq/dendrite-monolith:${TAG} .