From 6f4dfc6e92972055ac7c10d08cc2749134929607 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 2 Jan 2024 11:56:36 +0100 Subject: [PATCH] push to 0.15.1 --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 7 ++++--- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (93%) 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 b4844fc..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/matrix-appservice-telegram - 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 93% rename from Dockerfile rename to Containerfile index 6ea6e67..5b19794 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,6 +1,5 @@ -FROM docker.io/alpine:3.18 as builder +FROM docker.io/alpine:3.19 as builder -ENV VERSION=v0.14.2 RUN apk --no-cache add \ sed \ @@ -33,6 +32,8 @@ RUN apk --no-cache add \ py3-yarl \ py3-mako +ENV VERSION=v0.15.1 + RUN git clone https://github.com/mautrix/telegram.git WORKDIR /telegram RUN git checkout "$VERSION" @@ -41,7 +42,7 @@ RUN pip3 install --prefix=/install --upgrade -r optional-requirements.txt RUN cp -r mautrix_telegram /install/lib/python3.11/site-packages/ -FROM docker.io/thallian/confd-env:3.18-3.1.5.0 +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 ENV FFMPEG_BINARY=/usr/bin/ffmpeg