diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml index 331a198..61c6f7e 100644 --- a/.github/workflows/voice.yml +++ b/.github/workflows/voice.yml @@ -9,7 +9,7 @@ on: paths: - voice/** jobs: - push: + pushx64: 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,33 @@ jobs: push: true tags: | ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }} + + pushx64_arm64: + name: "yolks:voice_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - 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" + 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 }} diff --git a/README.md b/README.md index 13ef15c..e6a99a6 100644 --- a/README.md +++ b/README.md @@ -221,8 +221,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) 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"] 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'))