From 2c886bc537c879030b0ec61b66077bb11e9bd484 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 1 Jan 2024 20:23:32 +0100 Subject: [PATCH] push to 0.6.4 --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 8 +++++--- 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (82%) 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 763b5ae..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/matrix-appservice-discord - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW diff --git a/Dockerfile b/Containerfile similarity index 82% rename from Dockerfile rename to Containerfile index a9dd713..2483162 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,6 +1,6 @@ -FROM docker.io/golang:1.20-alpine3.18 as builder +FROM docker.io/golang:1.21-alpine3.19 as builder -ENV VERSION=v0.6.2 +ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE" RUN apk --no-cache add \ git \ @@ -12,13 +12,15 @@ RUN apk --no-cache add \ RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so WORKDIR /build + +ENV VERSION=v0.6.4 RUN git clone https://github.com/mautrix/discord.git WORKDIR /build/discord RUN git checkout $VERSION RUN go build -o /build/bin/mautrix-discord -FROM docker.io/thallian/confd-env:3.18-3.1.5.0 +FROM docker.io/thallian/confd-env:3.19-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