From ca5f398aaf97c17eaf2f178209f118808a3ff3ad Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Sun, 13 Oct 2024 03:55:39 +0800 Subject: [PATCH] chore: cleanup --- {apps => .archive/apps}/yagpdb/Dockerfile | 0 {apps => .archive/apps}/yagpdb/ci/goss.yaml | 0 {apps => .archive/apps}/yagpdb/ci/latest.sh | 0 {apps => .archive/apps}/yagpdb/metadata.yaml | 0 apps/bird/Dockerfile | 2 +- apps/bird/ci/latest.sh | 4 ++-- 6 files changed, 3 insertions(+), 3 deletions(-) rename {apps => .archive/apps}/yagpdb/Dockerfile (100%) rename {apps => .archive/apps}/yagpdb/ci/goss.yaml (100%) rename {apps => .archive/apps}/yagpdb/ci/latest.sh (100%) rename {apps => .archive/apps}/yagpdb/metadata.yaml (100%) diff --git a/apps/yagpdb/Dockerfile b/.archive/apps/yagpdb/Dockerfile similarity index 100% rename from apps/yagpdb/Dockerfile rename to .archive/apps/yagpdb/Dockerfile diff --git a/apps/yagpdb/ci/goss.yaml b/.archive/apps/yagpdb/ci/goss.yaml similarity index 100% rename from apps/yagpdb/ci/goss.yaml rename to .archive/apps/yagpdb/ci/goss.yaml diff --git a/apps/yagpdb/ci/latest.sh b/.archive/apps/yagpdb/ci/latest.sh similarity index 100% rename from apps/yagpdb/ci/latest.sh rename to .archive/apps/yagpdb/ci/latest.sh diff --git a/apps/yagpdb/metadata.yaml b/.archive/apps/yagpdb/metadata.yaml similarity index 100% rename from apps/yagpdb/metadata.yaml rename to .archive/apps/yagpdb/metadata.yaml diff --git a/apps/bird/Dockerfile b/apps/bird/Dockerfile index 8eb629e1..303107ba 100644 --- a/apps/bird/Dockerfile +++ b/apps/bird/Dockerfile @@ -1,6 +1,6 @@ ARG VERSION -FROM public.ecr.aws/docker/library/alpine:3.19.1 +FROM public.ecr.aws/docker/library/alpine:3.20 ARG VERSION RUN apk add bird=${VERSION} RUN apk add catatonit diff --git a/apps/bird/ci/latest.sh b/apps/bird/ci/latest.sh index 13abde8e..cfd814fd 100755 --- a/apps/bird/ci/latest.sh +++ b/apps/bird/ci/latest.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash #version="$(curl -sX GET "https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS" 2>/dev/null | awk '/Version/{print $2}' 2>/dev/null | head -n 1 2>/dev/null)" -version="$(curl -sX GET "https://git.alpinelinux.org/aports/plain/community/bird/APKBUILD" | awk -F'=' '/pkgver/{print $2}')" +version="$(curl -sX GET "https://git.alpinelinux.org/aports/plain/community/bird/APKBUILD?h=3.20-stable" | awk -F'=' '/pkgver/{print $2}')" version="${version#*v}" version="${version#*release-}" -version="${version}-r$(curl -sX GET "https://git.alpinelinux.org/aports/plain/community/bird/APKBUILD" | awk -F'=' '/pkgrel/{print $2}')" +version="${version}-r$(curl -sX GET "https://git.alpinelinux.org/aports/plain/community/bird/APKBUILD?h=3.20-stable" | awk -F'=' '/pkgrel/{print $2}')" printf "%s" "${version}"