From ef5564347f097ba8503bc00a4dea52ba3ff1deb4 Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Tue, 21 May 2024 19:06:22 +0200 Subject: [PATCH 1/3] Add more ARM images --- .github/workflows/ci.yml | 2 +- .github/workflows/manual_dispatch.yml | 2 +- .github/workflows/upstream_release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bbc675..9d763e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,4 +36,4 @@ jobs: docker_version: '0' publish: false update_latest: true - platforms: "linux/amd64,linux/arm64" + platforms: "linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8" diff --git a/.github/workflows/manual_dispatch.yml b/.github/workflows/manual_dispatch.yml index 4d80acc..528de4f 100644 --- a/.github/workflows/manual_dispatch.yml +++ b/.github/workflows/manual_dispatch.yml @@ -28,5 +28,5 @@ jobs: docker_version: ${{ github.event.inputs.docker_version }} publish: ${{ github.event.inputs.publish == 'true' }} update_latest: ${{ github.event.inputs.update_latest == 'true' }} - platforms: "linux/amd64,linux/arm64" + platforms: "linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8" secrets: inherit diff --git a/.github/workflows/upstream_release.yml b/.github/workflows/upstream_release.yml index 61ac715..ec2da31 100644 --- a/.github/workflows/upstream_release.yml +++ b/.github/workflows/upstream_release.yml @@ -12,5 +12,5 @@ jobs: docker_version: '0' publish: true update_latest: ${{ github.event.client_payload.is_latest }} - platforms: "linux/amd64,linux/arm64" + platforms: "linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8" secrets: inherit From bd23f5db56c40f323b7bd1c36c7dbc39e49dea02 Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Tue, 21 May 2024 19:06:39 +0200 Subject: [PATCH 2/3] Add 1.5.634 to CI builds --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d763e2..ecc86b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,14 @@ jobs: publish: false update_latest: false platforms: "linux/amd64" + build_1_5_634: + uses: ./.github/workflows/build_and_publish.yml + with: + mumble_version: "v1.5.634" + docker_version: '0' + publish: false + update_latest: true + platforms: "linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8" build_latest: uses: ./.github/workflows/build_and_publish.yml with: From d3db55572dc8f93ea8c4372c57a84365bfd95b4f Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Tue, 21 May 2024 20:12:25 +0200 Subject: [PATCH 3/3] Base image on 22.04 --- .github/workflows/ci.yml | 24 ------------------------ Dockerfile | 6 +++--- README.md | 2 +- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ecc86b4..7d7f42a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,30 +5,6 @@ on: [ push, pull_request ] # Note: As of now the strategy property is not supported when using reusable workflows, so we can't use a build # matrix to create the different build cases (see https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations) jobs: - build_1_4_230: - uses: ./.github/workflows/build_and_publish.yml - with: - mumble_version: "v1.4.230" - docker_version: '0' - publish: false - update_latest: false - platforms: "linux/amd64" - build_1_4_274: - uses: ./.github/workflows/build_and_publish.yml - with: - mumble_version: "v1.4.274" - docker_version: '0' - publish: false - update_latest: false - platforms: "linux/amd64" - build_1_4_287: - uses: ./.github/workflows/build_and_publish.yml - with: - mumble_version: "v1.4.287" - docker_version: '0' - publish: false - update_latest: false - platforms: "linux/amd64" build_1_5_634: uses: ./.github/workflows/build_and_publish.yml with: diff --git a/Dockerfile b/Dockerfile index 819a5b9..c03df1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 as base +FROM ubuntu:22.04 as base ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install --no-install-recommends -y \ @@ -64,8 +64,8 @@ RUN /mumble/scripts/clone.sh && /mumble/scripts/build.sh \ FROM base -ARG MUMBLE_UID=1000 -ARG MUMBLE_GID=1000 +ARG MUMBLE_UID=10000 +ARG MUMBLE_GID=10000 RUN groupadd --gid $MUMBLE_GID mumble && useradd --uid $MUMBLE_UID --gid $MUMBLE_GID mumble diff --git a/README.md b/README.md index a63d1f3..5a9e5ed 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Docker container using [docker-compose](https://docs.docker.com/compose/). Thus, In order for Mumble to store permanent data (most notably the database file (by default Mumble uses SQLite)), the image will use a [volume](https://docs.docker.com/storage/volumes/) which is mapped to the `/data/` path inside the image. By default the image uses a user with UID -`1000` and GID of also `1000` but either can be adapted when building the image yourself (see below). You will have to make sure that all file +`10000` and GID of also `10000` but either can be adapted when building the image yourself (see below). You will have to make sure that all file permissions are set up accordingly. ### Running the container