From b0576b6f8093162c36b8b96e26003f6bcfeeba02 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 16 Jun 2022 19:30:24 -0400 Subject: [PATCH] rebase to alpine 3.16 from edge --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 1 + 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 431986f..088981e 100755 --- 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_QBITTORRENT_MASTER\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" diff --git a/Dockerfile b/Dockerfile index 74f0911..a158084 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:edge +FROM ghcr.io/linuxserver/baseimage-alpine:3.16 # set version label ARG BUILD_DATE @@ -42,7 +42,7 @@ RUN \ make && \ install -v -m755 unrar /usr/bin && \ if [ -z ${QBITTORRENT_VERSION+x} ]; then \ - QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add -U --upgrade --no-cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6e01024..3cd1608 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 # set version label ARG BUILD_DATE @@ -42,7 +42,7 @@ RUN \ make && \ install -v -m755 unrar /usr/bin && \ if [ -z ${QBITTORRENT_VERSION+x} ]; then \ - QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add -U --upgrade --no-cache \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 98e402a..6332260 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-edge +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 # set version label ARG BUILD_DATE @@ -44,7 +44,7 @@ RUN \ make && \ install -v -m755 unrar /usr/bin && \ if [ -z ${QBITTORRENT_VERSION+x} ]; then \ - QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add -U --upgrade --no-cache \ diff --git a/Jenkinsfile b/Jenkinsfile index 804c3b2..4f14ea9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,8 +25,8 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent' PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent' DIST_IMAGE = 'alpine' - DIST_TAG = 'edge' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/' + DIST_TAG = '3.16' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/' DIST_REPO_PACKAGES = 'qbittorrent-nox' MULTIARCH='true' CI='true' diff --git a/README.md b/README.md index 01bfecb..a54e1e6 100644 --- a/README.md +++ b/README.md @@ -264,6 +264,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.06.22:** - Rebase to Alpine 3.16 from edge. * **25.05.22:** - Fetch qbitorrent-cli from upstream repo. * **02.03.22:** - Add unrar, 7zip, and qbitorrent-cli. * **01.03.22:** - Add python for search plugin support. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 8f66a0e..4619999 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,8 +15,8 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent' - PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent' - DIST_IMAGE = 'alpine' - - DIST_TAG = 'edge' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/' + - DIST_TAG = '3.16' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/' - DIST_REPO_PACKAGES = 'qbittorrent-nox' - MULTIARCH='true' - CI='true' diff --git a/readme-vars.yml b/readme-vars.yml index e65d43a..d9a1db0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -69,6 +69,7 @@ app_setup_block: | # changelog changelogs: + - { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." } - { date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo." } - { date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli." } - { date: "01.03.22:", desc: "Add python for search plugin support." }