mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-26 08:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

[temp] simplify how image name is sent to second dockerfile

Browse source 
Remove double :latest
This commit is contained in:
Caleb Xavier Berger 2021-01-19 02:28:24 -05:00
parent a9675fe5c3
commit 7e5a3c9ba3
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/Dockerfile.copyin vendored
View file

@ -1,7 +1,7 @@
ARG builder ARG builder
# https://stackoverflow.com/a/63472135/3551604 # https://stackoverflow.com/a/63472135/3551604
FROM ${TARGETPLATFORM}/${builder}:latest as builder FROM "${builder}" as builder
FROM alpine:latest FROM alpine:latest

8
.github/workflows/cross-compiling-docker.yml vendored
View file

@ -22,6 +22,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: set docker target - name: set docker target
run: echo "DOCKER_TARGET=$(./.github/workflows/get-compiler.sh docker)" >> $GITHUB_ENV run: echo "DOCKER_TARGET=$(./.github/workflows/get-compiler.sh docker)" >> $GITHUB_ENV
- name: set docker image tag
run: echo "BUILDER_IMAGE_TAG=${DOCKER_TARGET}/${BUILDER_IMAGE_NAME}:latest" >> $GITHUB_ENV
- uses: docker/setup-qemu-action@v1 - uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1 - uses: docker/setup-buildx-action@v1
with: with:
@ -32,10 +34,10 @@ jobs:
context: . context: .
file: ./.github/workflows/Dockerfile.builder file: ./.github/workflows/Dockerfile.builder
load: true # load into local image store load: true # load into local image store
tags: "${{ env.DOCKER_TARGET }}/${{ env.BUILDER_IMAGE_NAME }}:latest" tags: "${{ env.BUILDER_IMAGE_TAG }}"
build-args: "GOARCH=${{ env.GOARCH }}" build-args: "GOARCH=${{ env.GOARCH }}"
# - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV # - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- run: docker image inspect "${{ env.DOCKER_TARGET }}/${{ env.BUILDER_IMAGE_NAME }}:latest" - run: docker image inspect "${{ env.BUILDER_IMAGE_TAG }}"
- name: build monolith - name: build monolith
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
@ -44,4 +46,4 @@ jobs:
platforms: ${{ env.DOCKER_TARGET }} platforms: ${{ env.DOCKER_TARGET }}
push: true push: true
tags: localhost:5000/matrixdotorg/dendrite-monolith:latest tags: localhost:5000/matrixdotorg/dendrite-monolith:latest
build-args: "builder=${{ env.BUILDER_IMAGE_NAME }}\nDENDRITE_BINARY=dendrite-monolith-server" build-args: "builder=${{ env.BUILDER_IMAGE_TAG }}\nDENDRITE_BINARY=dendrite-monolith-server"