rebase to 3.15 include #183 symlink changes

This commit is contained in:
thelamer
2022-02-21 11:44:47 -08:00
committed by Ryan Kuba
parent 2f1e497bd9
commit 7b69e21c99
5 changed files with 237 additions and 178 deletions

View File

@@ -1,5 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.13 FROM ghcr.io/linuxserver/baseimage-alpine:3.15
ARG UNRAR_VERSION=6.1.4
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG TRANSMISSION_VERSION ARG TRANSMISSION_VERSION
@@ -7,63 +8,81 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="aptalca" LABEL maintainer="aptalca"
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache \ apk add --no-cache --upgrade --virtual=build-dependencies \
ca-certificates \ make \
curl \ g++ \
findutils \ gcc && \
jq \ echo "**** install packages ****" && \
openssl \ apk add --no-cache \
p7zip \ ca-certificates \
python3 \ curl \
rsync \ findutils \
tar \ jq \
transmission-cli \ openssl \
transmission-daemon \ p7zip \
unrar \ python3 \
unzip && \ rsync \
echo "**** install transmission ****" && \ tar \
if [ -z ${TRANSMISSION_VERSION+x} ]; then \ transmission-cli \
TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ transmission-daemon \
&& awk '/^P:transmission-daemon$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ unzip && \
fi && \ echo "**** install transmission ****" && \
apk add --no-cache \ apk add --no-cache \
transmission-cli==${TRANSMISSION_VERSION} \ transmission-cli \
transmission-daemon==${TRANSMISSION_VERSION} && \ transmission-daemon && \
echo "**** install third party themes ****" && \ echo "**** install unrar from source ****" && \
curl -o \ mkdir /tmp/unrar && \
/tmp/combustion.zip -L \ curl -o \
"https://github.com/Secretmapper/combustion/archive/release.zip" && \ /tmp/unrar.tar.gz -L \
unzip \ "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
/tmp/combustion.zip -d \ tar xf \
/ && \ /tmp/unrar.tar.gz -C \
mkdir -p /tmp/twctemp && \ /tmp/unrar --strip-components=1 && \
TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \ cd /tmp/unrar && \
| awk '/tag_name/{print $4;exit}' FS='[""]') && \ make && \
curl -o \ install -v -m755 unrar /usr/local/bin && \
/tmp/twc.tar.gz -L \ echo "**** install third party themes ****" && \
"https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" && \ curl -o \
tar xf \ /tmp/combustion.zip -L \
/tmp/twc.tar.gz -C \ "https://github.com/Secretmapper/combustion/archive/release.zip" && \
/tmp/twctemp --strip-components=1 && \ unzip \
mv /tmp/twctemp/src /transmission-web-control && \ /tmp/combustion.zip -d \
mkdir -p /kettu && \ / && \
curl -o \ mkdir -p /tmp/twctemp && \
/tmp/kettu.tar.gz -L \ TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \
"https://github.com/endor/kettu/archive/master.tar.gz" && \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \
tar xf \ curl -o \
/tmp/kettu.tar.gz -C \ /tmp/twc.tar.gz -L \
/kettu --strip-components=1 && \ "https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" && \
curl -o \ tar xf \
/tmp/flood-for-transmission.tar.gz -L \ /tmp/twc.tar.gz -C \
"https://github.com/johman10/flood-for-transmission/releases/download/latest/flood-for-transmission.tar.gz" && \ /tmp/twctemp --strip-components=1 && \
tar xf \ mv /tmp/twctemp/src /transmission-web-control && \
/tmp/flood-for-transmission.tar.gz -C \ # Enables the original UI button in transmission-web-control
/ && \ ln -s /usr/share/transmission/web/style /transmission-web-control && \
echo "**** cleanup ****" && \ ln -s /usr/share/transmission/web/images /transmission-web-control && \
rm -rf \ ln -s /usr/share/transmission/web/javascript /transmission-web-control && \
/tmp/* ln -s /usr/share/transmission/web/index.html /transmission-web-control/index.original.html && \
mkdir -p /kettu && \
curl -o \
/tmp/kettu.tar.gz -L \
"https://github.com/endor/kettu/archive/master.tar.gz" && \
tar xf \
/tmp/kettu.tar.gz -C \
/kettu --strip-components=1 && \
curl -o \
/tmp/flood-for-transmission.tar.gz -L \
"https://github.com/johman10/flood-for-transmission/releases/download/latest/flood-for-transmission.tar.gz" && \
tar xf \
/tmp/flood-for-transmission.tar.gz -C \
/ && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /

View File

@@ -1,5 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
ARG UNRAR_VERSION=6.1.4
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG TRANSMISSION_VERSION ARG TRANSMISSION_VERSION
@@ -7,63 +8,81 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="aptalca" LABEL maintainer="aptalca"
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache \ apk add --no-cache --upgrade --virtual=build-dependencies \
ca-certificates \ make \
curl \ g++ \
findutils \ gcc && \
jq \ echo "**** install packages ****" && \
openssl \ apk add --no-cache \
p7zip \ ca-certificates \
python3 \ curl \
rsync \ findutils \
tar \ jq \
transmission-cli \ openssl \
transmission-daemon \ p7zip \
unrar \ python3 \
unzip && \ rsync \
echo "**** install transmission ****" && \ tar \
if [ -z ${TRANSMISSION_VERSION+x} ]; then \ transmission-cli \
TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ transmission-daemon \
&& awk '/^P:transmission-daemon$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ unzip && \
fi && \ echo "**** install transmission ****" && \
apk add --no-cache \ apk add --no-cache \
transmission-cli==${TRANSMISSION_VERSION} \ transmission-cli \
transmission-daemon==${TRANSMISSION_VERSION} && \ transmission-daemon && \
echo "**** install third party themes ****" && \ echo "**** install unrar from source ****" && \
curl -o \ mkdir /tmp/unrar && \
/tmp/combustion.zip -L \ curl -o \
"https://github.com/Secretmapper/combustion/archive/release.zip" && \ /tmp/unrar.tar.gz -L \
unzip \ "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
/tmp/combustion.zip -d \ tar xf \
/ && \ /tmp/unrar.tar.gz -C \
mkdir -p /tmp/twctemp && \ /tmp/unrar --strip-components=1 && \
TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \ cd /tmp/unrar && \
| awk '/tag_name/{print $4;exit}' FS='[""]') && \ make && \
curl -o \ install -v -m755 unrar /usr/local/bin && \
/tmp/twc.tar.gz -L \ echo "**** install third party themes ****" && \
"https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" && \ curl -o \
tar xf \ /tmp/combustion.zip -L \
/tmp/twc.tar.gz -C \ "https://github.com/Secretmapper/combustion/archive/release.zip" && \
/tmp/twctemp --strip-components=1 && \ unzip \
mv /tmp/twctemp/src /transmission-web-control && \ /tmp/combustion.zip -d \
mkdir -p /kettu && \ / && \
curl -o \ mkdir -p /tmp/twctemp && \
/tmp/kettu.tar.gz -L \ TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \
"https://github.com/endor/kettu/archive/master.tar.gz" && \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \
tar xf \ curl -o \
/tmp/kettu.tar.gz -C \ /tmp/twc.tar.gz -L \
/kettu --strip-components=1 && \ "https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" && \
curl -o \ tar xf \
/tmp/flood-for-transmission.tar.gz -L \ /tmp/twc.tar.gz -C \
"https://github.com/johman10/flood-for-transmission/releases/download/latest/flood-for-transmission.tar.gz" && \ /tmp/twctemp --strip-components=1 && \
tar xf \ mv /tmp/twctemp/src /transmission-web-control && \
/tmp/flood-for-transmission.tar.gz -C \ # Enables the original UI button in transmission-web-control
/ && \ ln -s /usr/share/transmission/web/style /transmission-web-control && \
echo "**** cleanup ****" && \ ln -s /usr/share/transmission/web/images /transmission-web-control && \
rm -rf \ ln -s /usr/share/transmission/web/javascript /transmission-web-control && \
/tmp/* ln -s /usr/share/transmission/web/index.html /transmission-web-control/index.original.html && \
mkdir -p /kettu && \
curl -o \
/tmp/kettu.tar.gz -L \
"https://github.com/endor/kettu/archive/master.tar.gz" && \
tar xf \
/tmp/kettu.tar.gz -C \
/kettu --strip-components=1 && \
curl -o \
/tmp/flood-for-transmission.tar.gz -L \
"https://github.com/johman10/flood-for-transmission/releases/download/latest/flood-for-transmission.tar.gz" && \
tar xf \
/tmp/flood-for-transmission.tar.gz -C \
/ && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /

View File

@@ -1,5 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13 FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
ARG UNRAR_VERSION=6.1.4
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG TRANSMISSION_VERSION ARG TRANSMISSION_VERSION
@@ -7,63 +8,81 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="aptalca" LABEL maintainer="aptalca"
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache \ apk add --no-cache --upgrade --virtual=build-dependencies \
ca-certificates \ make \
curl \ g++ \
findutils \ gcc && \
jq \ echo "**** install packages ****" && \
openssl \ apk add --no-cache \
p7zip \ ca-certificates \
python3 \ curl \
rsync \ findutils \
tar \ jq \
transmission-cli \ openssl \
transmission-daemon \ p7zip \
unrar \ python3 \
unzip && \ rsync \
echo "**** install transmission ****" && \ tar \
if [ -z ${TRANSMISSION_VERSION+x} ]; then \ transmission-cli \
TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ transmission-daemon \
&& awk '/^P:transmission-daemon$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ unzip && \
fi && \ echo "**** install transmission ****" && \
apk add --no-cache \ apk add --no-cache \
transmission-cli==${TRANSMISSION_VERSION} \ transmission-cli \
transmission-daemon==${TRANSMISSION_VERSION} && \ transmission-daemon && \
echo "**** install third party themes ****" && \ echo "**** install unrar from source ****" && \
curl -o \ mkdir /tmp/unrar && \
/tmp/combustion.zip -L \ curl -o \
"https://github.com/Secretmapper/combustion/archive/release.zip" && \ /tmp/unrar.tar.gz -L \
unzip \ "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
/tmp/combustion.zip -d \ tar xf \
/ && \ /tmp/unrar.tar.gz -C \
mkdir -p /tmp/twctemp && \ /tmp/unrar --strip-components=1 && \
TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \ cd /tmp/unrar && \
| awk '/tag_name/{print $4;exit}' FS='[""]') && \ make && \
curl -o \ install -v -m755 unrar /usr/local/bin && \
/tmp/twc.tar.gz -L \ echo "**** install third party themes ****" && \
"https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" && \ curl -o \
tar xf \ /tmp/combustion.zip -L \
/tmp/twc.tar.gz -C \ "https://github.com/Secretmapper/combustion/archive/release.zip" && \
/tmp/twctemp --strip-components=1 && \ unzip \
mv /tmp/twctemp/src /transmission-web-control && \ /tmp/combustion.zip -d \
mkdir -p /kettu && \ / && \
curl -o \ mkdir -p /tmp/twctemp && \
/tmp/kettu.tar.gz -L \ TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \
"https://github.com/endor/kettu/archive/master.tar.gz" && \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \
tar xf \ curl -o \
/tmp/kettu.tar.gz -C \ /tmp/twc.tar.gz -L \
/kettu --strip-components=1 && \ "https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" && \
curl -o \ tar xf \
/tmp/flood-for-transmission.tar.gz -L \ /tmp/twc.tar.gz -C \
"https://github.com/johman10/flood-for-transmission/releases/download/latest/flood-for-transmission.tar.gz" && \ /tmp/twctemp --strip-components=1 && \
tar xf \ mv /tmp/twctemp/src /transmission-web-control && \
/tmp/flood-for-transmission.tar.gz -C \ # Enables the original UI button in transmission-web-control
/ && \ ln -s /usr/share/transmission/web/style /transmission-web-control && \
echo "**** cleanup ****" && \ ln -s /usr/share/transmission/web/images /transmission-web-control && \
rm -rf \ ln -s /usr/share/transmission/web/javascript /transmission-web-control && \
/tmp/* ln -s /usr/share/transmission/web/index.html /transmission-web-control/index.original.html && \
mkdir -p /kettu && \
curl -o \
/tmp/kettu.tar.gz -L \
"https://github.com/endor/kettu/archive/master.tar.gz" && \
tar xf \
/tmp/kettu.tar.gz -C \
/kettu --strip-components=1 && \
curl -o \
/tmp/flood-for-transmission.tar.gz -L \
"https://github.com/johman10/flood-for-transmission/releases/download/latest/flood-for-transmission.tar.gz" && \
tar xf \
/tmp/flood-for-transmission.tar.gz -C \
/ && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /

View File

@@ -275,8 +275,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **09.07.21:** - Wait for the transmission-daemon termination after a caught sigterm * **21.02.22:** - Build unrar from source, rebase to Alpine 3.15, add symlinks neeeded for TWC. Credit @alexbelgium
* **06.03.21:** - Add Flood for Transmission as a UI option * **09.07.21:** - Wait for the transmission-daemon termination after a caught sigterm.
* **06.03.21:** - Add Flood for Transmission as a UI option.
* **23.01.21:** - Rebasing to alpine 3.13. * **23.01.21:** - Rebasing to alpine 3.13.
* **02.11.20:** - Add ca-certificates package to allow connecting to https trackers. * **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. * **02.06.20:** - Rebase to alpine 3.12, update to transmission 3.0, remove python2, add python3.

View File

@@ -84,8 +84,9 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "09.07.21:", desc: "Wait for the transmission-daemon termination after a caught sigterm" } - { date: "21.02.22:", desc: "Build unrar from source, rebase to Alpine 3.15, add symlinks neeeded for TWC. Credit @alexbelgium" }
- { date: "06.03.21:", desc: "Add Flood for Transmission as a UI option" } - { date: "09.07.21:", desc: "Wait for the transmission-daemon termination after a caught sigterm." }
- { date: "06.03.21:", desc: "Add Flood for Transmission as a UI option." }
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } - { 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.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: "02.06.20:", desc: "Rebase to alpine 3.12, update to transmission 3.0, remove python2, add python3." }