From 8fbe72d9b170523848d79c1a5303cfb9bce8b576 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 12 Jul 2022 19:40:00 +0200 Subject: [PATCH 01/10] update base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e33865c..e2f6320 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:latest +FROM thallian/confd-env:3.16 RUN apk add --no-cache \ murmur \ From 90543612549a5db18432ad43d76e3fa74171036f Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 27 Oct 2022 15:03:33 +0200 Subject: [PATCH 02/10] use lego names for certificates --- rootfs/etc/confd/templates/murmur.ini.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/confd/templates/murmur.ini.tmpl b/rootfs/etc/confd/templates/murmur.ini.tmpl index 8379511..92c9f11 100644 --- a/rootfs/etc/confd/templates/murmur.ini.tmpl +++ b/rootfs/etc/confd/templates/murmur.ini.tmpl @@ -157,8 +157,8 @@ registerName={{ getenv "ROOT_NAME" "Root" }} # If you have a proper SSL certificate, you can provide the filenames here. # Otherwise, Murmur will create it's own certificate automatically. -sslCert=/etc/ssl/murmur/tls.crt -sslKey=/etc/ssl/murmur/tls.key +sslCert=/etc/ssl/murmur/cert.pem +sslKey=/etc/ssl/murmur/key.pem # The sslCiphers option chooses the cipher suites to make available for use # in SSL/TLS. This option is server-wide, and cannot be set on a From 267b9aa735e2f5e6625ea55572c76ad06703ca2d Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:51:20 +0000 Subject: [PATCH 03/10] Delete '.gitlab-ci.yml' --- .gitlab-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 04eda13..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -variables: - CONTAINER_NAME: thallian/murmur - -build: - stage: build - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - - >- - /kaniko/executor - --context "$CI_PROJECT_DIR" - --dockerfile "$CI_PROJECT_DIR/Dockerfile" - --destination "$CONTAINER_NAME:$CI_COMMIT_SHA" - --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME" - --destination "$CONTAINER_NAME:latest" From f1c789a97b8da6194f8717e1d9646758dbf95fc6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:51:57 +0000 Subject: [PATCH 04/10] Add '.woodpecker.yml' --- .woodpecker.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..ca375e8 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,11 @@ +pipeline: + publish-docker-image: + image: plugins/kaniko + settings: + repo: docker.io/thallian/murmur + tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} + dockerfile: Dockerfile + username: + from_secret: DOCKER_USER + password: + from_secret: DOCKER_PW \ No newline at end of file From 0760580c80204aa64cacb98bc9e4385217ddc28a Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 17:36:08 +0100 Subject: [PATCH 05/10] use alpine 3.17 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e2f6320..d5af03b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:3.16 +FROM thallian/confd-env:3.17 RUN apk add --no-cache \ murmur \ From 2986f58c9620f6e9ab34964d45cdbb2ac6edaed3 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 26 Sep 2023 16:39:39 +0200 Subject: [PATCH 06/10] push to 1.4.287 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d5af03b..0699a8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:3.17 +FROM thallian/confd-env:3.18 RUN apk add --no-cache \ murmur \ From ab9f86bea9c16e39e8930de7cc5b274d25ebfe9b Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 26 Sep 2023 16:41:04 +0200 Subject: [PATCH 07/10] push to 1.4.287 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0699a8f..a132fb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:3.18 +FROM thallian/confd-env:3.18-3.1.5.0 RUN apk add --no-cache \ murmur \ From 8d053549e32564964e740a8c3f74cc69621c8e79 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 19 Dec 2023 18:10:36 +0100 Subject: [PATCH 08/10] push to version 1.4.287-r10 --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (76%) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.gitea/workflows/container.yaml @@ -0,0 +1,12 @@ +name: Build Multiarch Container Image +on: [push] +jobs: + call-reusable-workflow: + uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index ca375e8..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/murmur - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW \ No newline at end of file diff --git a/Dockerfile b/Containerfile similarity index 76% rename from Dockerfile rename to Containerfile index a132fb0..b03da6a 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:3.18-3.1.5.0 +FROM thallian/confd-env:3.19-3.1.6.2 RUN apk add --no-cache \ murmur \ From bc47b87afe54ad93f85fe34f2286877a00b6ba26 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 19 Dec 2023 18:11:38 +0100 Subject: [PATCH 09/10] use FQDN for base image --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index b03da6a..50b224f 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:3.19-3.1.6.2 +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 RUN apk add --no-cache \ murmur \ From 1cb57f90c1effe155aea43d6ba8a2776f12f5657 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 20 Dec 2023 07:55:43 +0100 Subject: [PATCH 10/10] correct default values in README --- README.md | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b602cbf..1f041e9 100644 --- a/README.md +++ b/README.md @@ -1,62 +1,78 @@ -Murmur server for [Mumble](https://wiki.mumble.info/wiki/Main_Page) with -a postgre backend. +Murmur server for [Mumble](https://wiki.mumble.info/wiki/Main_Page) with a +postgre backend. # Volumes + - `/etc/ssl/murmur:ro`: certificates have to be here # Environment Variables + ## WELCOME_TEXT + Welcome message sent to clients when they connect. ## SERVER_PASSWORD + Password to join server. ## ADMIN_PASSWORD + Password of the SuperUser. ## MAX_BANDWIDTH + - default: 72000 Maximum bandwidth (in bits per second) clients are allowed to send speech at. ## MAX_USERS + - default: 20 Maximum number of concurrent clients allowed. ## CERT_DOMAIN + Name of the certificate domain. ## ROOT_NAME + - default: Root Name of the root channel. ## DB_HOST + Database host. ## DB_NAME -- default: moodle + +- default: murmur Database name. ## DB_USER -- default: moodle + +- default: murmur Database user. ## DB_PASSWORD + Password for the database user. ## DB_PORT + - default: 5432 Database port. # Ports + - 64738 # Capabilities + - CHOWN - DAC_OVERRIDE - FOWNER