From babd606e282101db6d940488649dd519009e2c50 Mon Sep 17 00:00:00 2001 From: Quinten Date: Wed, 5 Oct 2022 20:18:13 +0200 Subject: [PATCH 1/6] add mumble to be build on arm --- .github/workflows/voice.yml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml index 331a198..7795be8 100644 --- a/.github/workflows/voice.yml +++ b/.github/workflows/voice.yml @@ -9,7 +9,7 @@ on: paths: - voice/** jobs: - push: + pushTeaspeak: name: "yolks:voice_${{ matrix.tag }}" runs-on: ubuntu-latest strategy: @@ -17,7 +17,6 @@ jobs: matrix: tag: - teaspeak - - mumble steps: - uses: actions/checkout@v3 - uses: docker/setup-buildx-action@v2 @@ -37,3 +36,31 @@ jobs: push: true tags: | ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }} + + pushmumble: + name: "yolks:voice_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - mumble + steps: + - uses: actions/checkout@v3 + - uses: docker/setup-buildx-action@v2 + with: + version: "v0.8.2" + buildkitd-flags: --debug + - uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v3 + with: + context: ./voice/${{ matrix.tag }} + file: ./voice/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64,linux/arm64 + push: true + tags: | + ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }} \ No newline at end of file From c4c273461c4475d71ca6b315bb856c451a978d12 Mon Sep 17 00:00:00 2001 From: Quinten Date: Wed, 5 Oct 2022 20:22:43 +0200 Subject: [PATCH 2/6] add mumble to main readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c1f6e7e..8482895 100644 --- a/README.md +++ b/README.md @@ -216,8 +216,9 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:rust_latest` ### [Voice](/voice) - -* [`TeaSpeak`](/teaspeak) +* [`Mumble`](/voice/mumble) + * `ghcr.io/parkervcp/yolks:voice_mumble` +* [`TeaSpeak`](/voice/teaspeak) * `ghcr.io/parkervcp/yolks:voice_teaspeak` ### [Wine](/wine) From 6cafe1219376d3b0750f58f821f959250d6cc86d Mon Sep 17 00:00:00 2001 From: Quinten Date: Wed, 5 Oct 2022 20:24:32 +0200 Subject: [PATCH 3/6] do not try to print the cargo version as it is not installed --- voice/mumble/entrypoint.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/voice/mumble/entrypoint.sh b/voice/mumble/entrypoint.sh index 4b50be7..bbafa01 100644 --- a/voice/mumble/entrypoint.sh +++ b/voice/mumble/entrypoint.sh @@ -5,8 +5,6 @@ cd /home/container INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP -# Print current Rust version -cargo --version # Replace Startup Variables MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')) From 2b28025cd1ddf21f0401d283b611f627c148ce6d Mon Sep 17 00:00:00 2001 From: QuintenQVD0 Date: Sun, 9 Oct 2022 20:30:52 +0200 Subject: [PATCH 4/6] update workflow build naming --- .github/workflows/voice.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml index 7795be8..6005997 100644 --- a/.github/workflows/voice.yml +++ b/.github/workflows/voice.yml @@ -9,7 +9,7 @@ on: paths: - voice/** jobs: - pushTeaspeak: + pushx64: name: "yolks:voice_${{ matrix.tag }}" runs-on: ubuntu-latest strategy: @@ -37,7 +37,7 @@ jobs: tags: | ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }} - pushmumble: + pushx64_arm64: name: "yolks:voice_${{ matrix.tag }}" runs-on: ubuntu-latest strategy: From 559efa8297d44787304296dd96879f9aad4592cf Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sun, 9 Oct 2022 20:48:48 +0200 Subject: [PATCH 5/6] fix brom bash to ash --- voice/mumble/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voice/mumble/Dockerfile b/voice/mumble/Dockerfile index b3a656d..7a7da1b 100644 --- a/voice/mumble/Dockerfile +++ b/voice/mumble/Dockerfile @@ -15,4 +15,4 @@ ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/ash", "/entrypoint.sh"] From 42c385ccfa9a56b0f899ad195c92c812d2204ceb Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Thu, 13 Oct 2022 18:50:05 +0200 Subject: [PATCH 6/6] add qemu for build mumble --- .github/workflows/voice.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml index 6005997..61c6f7e 100644 --- a/.github/workflows/voice.yml +++ b/.github/workflows/voice.yml @@ -47,6 +47,8 @@ jobs: - mumble steps: - uses: actions/checkout@v3 + # Setup QEMU for ARM64 Build + - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v2 with: version: "v0.8.2" @@ -63,4 +65,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }} \ No newline at end of file + ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}