mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-26 08:13:09 -06:00
Fix wrong tag used in copyin
This commit is contained in:
parent
699842748f
commit
190dd7b105
6
.github/workflows/Dockerfile.copyin
vendored
6
.github/workflows/Dockerfile.copyin
vendored
|
|
@ -1,8 +1,10 @@
|
||||||
ARG builder
|
ARG builder
|
||||||
ARG TARGETARCH
|
ARG TARGETPLATFORM
|
||||||
|
|
||||||
|
RUN "echo $TARGETPLATFORM"
|
||||||
|
|
||||||
# https://stackoverflow.com/a/63472135/3551604
|
# https://stackoverflow.com/a/63472135/3551604
|
||||||
FROM ${TARGETARCH}/${builder}:latest as builder
|
FROM ${TARGETPLATFORM}/${builder}:latest as builder
|
||||||
|
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
|
|
||||||
|
|
|
||||||
2
.github/workflows/cross-compiling-docker.yml
vendored
2
.github/workflows/cross-compiling-docker.yml
vendored
|
|
@ -22,6 +22,7 @@ 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
|
||||||
|
- uses: docker/setup-qemu-action@v1
|
||||||
- uses: docker/setup-buildx-action@v1
|
- uses: docker/setup-buildx-action@v1
|
||||||
with:
|
with:
|
||||||
driver-opts: network=host
|
driver-opts: network=host
|
||||||
|
|
@ -34,7 +35,6 @@ jobs:
|
||||||
tags: "${{ env.DOCKER_TARGET }}/${{ env.BUILDER_IMAGE_NAME }}:latest"
|
tags: "${{ env.DOCKER_TARGET }}/${{ env.BUILDER_IMAGE_NAME }}:latest"
|
||||||
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
|
||||||
- uses: docker/setup-qemu-action@v1
|
|
||||||
- name: build monolith
|
- name: build monolith
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v2
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue