Merge pull request linuxserver#143 from linuxserver/master-3.13

pupca · Feb 1, 2021 · f06639e · f06639e
2 parents 3a0a234 + dd1377c
commit f06639e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_TRANSMISSION_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.12/community/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}')
+          EXT_RELEASE=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for transmission branch master"

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.12
+FROM ghcr.io/linuxserver/baseimage-alpine:3.13
 
 # set version label
 ARG BUILD_DATE
@@ -25,7 +25,7 @@ RUN \
 	unzip && \
  echo "**** install transmission ****" && \
  if [ -z ${TRANSMISSION_VERSION+x} ]; then \
-	TRANSMISSION_VERSION=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.12/community/x86_64/ \
+	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}'); \
  fi && \
  apk add --no-cache \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13
 
 ARG BUILD_DATE
 ARG VERSION
@@ -24,7 +24,7 @@ RUN \
 	unzip && \
  echo "**** install transmission ****" && \
  if [ -z ${TRANSMISSION_VERSION+x} ]; then \
-	TRANSMISSION_VERSION=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.12/community/x86_64/ \
+	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}'); \
  fi && \
  apk add --no-cache \

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13
 
 ARG BUILD_DATE
 ARG VERSION
@@ -24,7 +24,7 @@ RUN \
 	unzip && \
  echo "**** install transmission ****" && \
  if [ -z ${TRANSMISSION_VERSION+x} ]; then \
-	TRANSMISSION_VERSION=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.12/community/x86_64/ \
+	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}'); \
  fi && \
  apk add --no-cache \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -103,7 +103,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -s http://dl-cdn.alpinelinux.org/alpine/v3.12/community/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}' ''',
+            script: ''' curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }

diff --git a/README.md b/README.md
@@ -260,6 +260,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.01.21:** - Rebasing to alpine 3.13.
 * **02.11.20:** - Add ca-certificates package to allow connecting to https trackers.
 * **02.06.20:** - Rebase to alpine 3.12, update to transmission 3.0, remove python2, add python3.
 * **11.05.20:** - Remove unnecessary chmod (remnant of previous change).

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-transmission
 external_type: na
-custom_version_command: "curl -s http://dl-cdn.alpinelinux.org/alpine/v3.12/community/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}'"
+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}'"
 release_type: stable
 release_tag: latest
 ls_branch: master

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -76,6 +76,7 @@ app_setup_block: |
 # changelog
 changelogs:
 
+  - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
   - { date: "02.11.20:", desc: "Add ca-certificates package to allow connecting to https trackers." }
   - { date: "02.06.20:", desc: "Rebase to alpine 3.12, update to transmission 3.0, remove python2, add python3." }
   - { date: "11.05.20:", desc: "Remove unnecessary chmod (remnant of previous change)." }