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/Containerfile b/Containerfile index adaf6ee..4c9ae29 100644 --- a/Containerfile +++ b/Containerfile @@ -1,6 +1,6 @@ -FROM docker.io/golang:1.24-alpine3.21 as builder +FROM docker.io/golang:1.22-alpine3.20 as builder -ENV VERSION=v0.12.2 +ENV VERSION=v0.11.0 RUN apk --no-cache add \ git \ @@ -18,7 +18,7 @@ RUN git checkout $VERSION RUN go build -o /build/bin/mautrix-whatsapp /build/mautrix-whatsapp/cmd/mautrix-whatsapp/ -FROM docker.io/thallian/confd-env:3.21-3.2.0.2 +FROM docker.io/thallian/confd-env:3.20-3.1.6.2 RUN addgroup -g 2222 matrix-bridge RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index a8bfde8..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1 +0,0 @@ -multiarch_container() diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index cde3080..163b24c 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -168,10 +168,10 @@ bridge: relay: # Whether relay mode should be allowed. If allowed, the set-relay command can be used to turn any # authenticated user into a relaybot for that chat. - enabled: true + enabled: false # Should only admins be allowed to set themselves as relay users? # If true, non-admins can only set users listed in default_relays as relays in a room. - admin_only: false + admin_only: true # List of user login IDs which anyone can set as a relay, as long as the relay user is in the room. default_relays: [] # The formats to use when sending messages via the relaybot.