From 9b38a7e7a3bc55304625a8203cd7d600352d66f1 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Thu, 4 Nov 2021 22:56:09 +0100 Subject: [PATCH] some fixes --- .woodpecker.yml | 8 ++++++-- Dockerfile | 9 ++------- renovate.json | 23 ++--------------------- 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 2dbd862..5be7e3e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,7 +5,9 @@ pipeline: - DOCKER_USERNAME - DOCKER_PASSWORD repo: spcodes/coturn - tags: latest + tags: + - 4.5.2 + - latest when: branch: - main @@ -20,7 +22,9 @@ pipeline: target: DOCKER_PASSWORD registry: cr.sp-codes.de repo: cr.sp-codes.de/coturn - tags: latest + tags: + - 4.5.2 + - latest when: branch: - main diff --git a/Dockerfile b/Dockerfile index e982833..0cd2ffc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:11.0-slim@sha256:dacf278785a4daa9de07596ec739dbc07131e189942772210709c5c0777e8437 +FROM debian:11.1-slim@sha256:dddc0f5f01db7ca3599fd8cf9821ffc4d09ec9d7d15e49019e73228ac1eee7f9 ENV COTURN_VERSION="4.5.2" ENV PROMETHEUS_CLIENT_VERSION="v0.1.3" @@ -7,12 +7,7 @@ ENV BUILD_PREFIX /usr/local/src WORKDIR /root/coturn -RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ - build-essential="12.6" \ - pkg-config="0.29.2-1" \ - libssl-dev="1.1.1k-1" \ - libevent-dev="2.1.12-stable-1" \ - curl \ +RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y build-essential pkg-config libssl-dev libevent-dev curl \ && PCV=$(echo "${PROMETHEUS_CLIENT_VERSION}" | cut -c 2-) \ && curl -L "https://github.com/digitalocean/prometheus-client-c/releases/download/${PROMETHEUS_CLIENT_VERSION}/libprom-dev-${PCV}-Linux.deb" > /tmp/libprom.deb \ && curl -L "https://github.com/digitalocean/prometheus-client-c/releases/download/${PROMETHEUS_CLIENT_VERSION}/libpromhttp-dev-${PCV}-Linux.deb" > /tmp/libpromhttp.deb \ diff --git a/renovate.json b/renovate.json index 73d04ad..70f3609 100644 --- a/renovate.json +++ b/renovate.json @@ -11,11 +11,11 @@ { "fileMatch": [ "^Dockerfile$", - "^.drone.yml$" + "^.woodpecker.yml$" ], "matchStrings": [ "\\s+ENV\\s*COTURN_VERSION=\"(?.*?)\"\\s+", - "\\s+target:\\s*spcodes\\/coturn:(?.*?)\\s+" + "\\s+repo:\\s*\\S*\\/coturn\\s+tags:[-\\s]+(?.*?)\\s+" ], "versioningTemplate": "loose", "depNameTemplate": "coturn/coturn", @@ -31,17 +31,6 @@ "versioningTemplate": "loose", "depNameTemplate": "digitalocean/prometheus-client-c", "datasourceTemplate": "github-releases" - }, - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "\\s+(?[a-z0-9\\-]+?)=\"(?.*?)\"" - ], - "lookupNameTemplate": "debian_stable/{{{depName}}}", - "versioningTemplate": "loose", - "datasourceTemplate": "repology" } ], "packageRules": [ @@ -53,14 +42,6 @@ "coturn" ] }, - { - "datasources": [ - "repology" - ], - "groupName": [ - "base dependencies" - ] - }, { "datasources": [ "docker"