From 849e5195d9cb763cbf29684de44af3166c71cc87 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Sun, 14 Feb 2021 10:49:00 -0600
Subject: [PATCH] Use external_type: alpine_repo

---
 Dockerfile         | 5 ++---
 Dockerfile.aarch64 | 4 ++--
 Dockerfile.armhf   | 4 ++--
 jenkins-vars.yml   | 6 ++++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 73b64bf..6db7058 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 FROM ghcr.io/linuxserver/baseimage-alpine:3.13
 
-# set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG TRANSMISSION_VERSION
@@ -25,8 +24,8 @@ RUN \
 	unzip && \
  echo "**** install transmission ****" && \
  if [ -z ${TRANSMISSION_VERSION+x} ]; then \
-	TRANSMISSION_VERSION=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/ \
-	| awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}'); \
+	TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+	&& awk '/^P:transmission-daemon$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  fi && \
  apk add --no-cache \
 	transmission-cli==${TRANSMISSION_VERSION} \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 38c3739..4c0c4d5 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -24,8 +24,8 @@ RUN \
 	unzip && \
  echo "**** install transmission ****" && \
  if [ -z ${TRANSMISSION_VERSION+x} ]; then \
-	TRANSMISSION_VERSION=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/ \
-	| awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}'); \
+	TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+	&& awk '/^P:transmission-daemon$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  fi && \
  apk add --no-cache \
 	transmission-cli==${TRANSMISSION_VERSION} \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index d24a060..12b22fb 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -24,8 +24,8 @@ RUN \
 	unzip && \
  echo "**** install transmission ****" && \
  if [ -z ${TRANSMISSION_VERSION+x} ]; then \
-	TRANSMISSION_VERSION=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/ \
-	| awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}'); \
+	TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+	&& awk '/^P:transmission-daemon$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  fi && \
  apk add --no-cache \
 	transmission-cli==${TRANSMISSION_VERSION} \
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index f65c107..729ad83 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -2,8 +2,7 @@
 
 # jenkins variables
 project_name: docker-transmission
-external_type: na
-custom_version_command: "curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}'"
+external_type: alpine_repo
 release_type: stable
 release_tag: latest
 ls_branch: master
@@ -16,6 +15,9 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/transmission'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/transmission'
   - DIST_IMAGE = 'alpine'
+  - DIST_TAG = '3.13'
+  - DIST_REPO = 'http://nl.alpinelinux.org/alpine/v3.13/main/'
+  - DIST_REPO_PACKAGES = 'transmission-daemon'
   - MULTIARCH='true'
   - CI='true'
   - CI_WEB='true'