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/.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" diff --git a/Dockerfile b/Containerfile similarity index 72% rename from Dockerfile rename to Containerfile index e33865c..50b224f 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:latest +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 RUN apk add --no-cache \ murmur \ 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 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