mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-28 01:03:10 -06:00
Fix YAML errors because I am smart
add missing env. Somehow, I forgot to write `run` in `docker run` tag -> tags
This commit is contained in:
parent
2e473d83af
commit
dc6213ddc8
8
.github/workflows/cross-compiling-docker.yml
vendored
8
.github/workflows/cross-compiling-docker.yml
vendored
|
|
@ -20,16 +20,15 @@ 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
|
||||||
tag: dendrite-builder:${{ matrix.target }}
|
tags: "dendrite-builder:${{ matrix.target }}"
|
||||||
- name: copy built files out of docker
|
- name: copy built files out of docker
|
||||||
run: docker -v "$(pwd)/bin:/build/bin-out" builder:${{ matrix.target }} "/bin/sh" "-c" "cp -a /build/bin/* /build/bin-out"
|
run: docker run -v "$(pwd)/bin:/build/bin-out" builder:${{ matrix.target }} "/bin/sh" "-c" "cp -a /build/bin/* /build/bin-out"
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: bin-${{ matrix.target }}
|
name: bin-${{ matrix.target }}
|
||||||
path: ./bin
|
path: ./bin
|
||||||
build-monolith:
|
build-monolith:
|
||||||
needs: [compile]
|
needs: [compile]
|
||||||
local-registry:
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
services:
|
services:
|
||||||
registry:
|
registry:
|
||||||
|
|
@ -41,7 +40,6 @@ jobs:
|
||||||
target: [amd64, arm64, arm]
|
target: [amd64, arm64, arm]
|
||||||
env:
|
env:
|
||||||
DOCKER_HUB_USER: dendritegithub
|
DOCKER_HUB_USER: dendritegithub
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/download-artifact@v2
|
- uses: actions/download-artifact@v2
|
||||||
|
|
@ -57,6 +55,6 @@ jobs:
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./.github/workflows/Dockerfile.copyin
|
file: ./.github/workflows/Dockerfile.copyin
|
||||||
platforms: ${{ DOCKER_TARGET }}
|
platforms: ${{ env.DOCKER_TARGET }}
|
||||||
push: true
|
push: true
|
||||||
tags: localhost:5000/matrixdotorg/dendrite-monolith:latest
|
tags: localhost:5000/matrixdotorg/dendrite-monolith:latest
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue