diff --git a/Dockerfile b/Dockerfile index 067202b..5034592 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,6 +43,13 @@ RUN \ make && \ install -v -m755 unrar /usr/local/bin && \ echo "**** install third party themes ****" && \ + TRANSMISSIONIC_VERSION=$(curl -s "https://api.github.com/repos/6c65726f79/Transmissionic/releases/latest" | jq -r .tag_name) && \ + curl -o \ + /tmp/transmissionic.zip -L \ + "https://github.com/6c65726f79/Transmissionic/releases/download/${TRANSMISSIONIC_VERSION}/Transmissionic-webui-${TRANSMISSIONIC_VERSION}.zip" && \ + unzip \ + /tmp/transmissionic.zip -d \ + / && \ curl -o \ /tmp/combustion.zip -L \ "https://github.com/Secretmapper/combustion/archive/release.zip" && \ @@ -50,8 +57,7 @@ RUN \ /tmp/combustion.zip -d \ / && \ mkdir -p /tmp/twctemp && \ - TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]') && \ + TWCVERSION=$(curl -s "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" | jq -r .tag_name) && \ curl -o \ /tmp/twc.tar.gz -L \ "https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ede607e..61b1272 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -43,6 +43,13 @@ RUN \ make && \ install -v -m755 unrar /usr/local/bin && \ echo "**** install third party themes ****" && \ + TRANSMISSIONIC_VERSION=$(curl -s "https://api.github.com/repos/6c65726f79/Transmissionic/releases/latest" | jq -r .tag_name) && \ + curl -o \ + /tmp/transmissionic.zip -L \ + "https://github.com/6c65726f79/Transmissionic/releases/download/${TRANSMISSIONIC_VERSION}/Transmissionic-webui-${TRANSMISSIONIC_VERSION}.zip" && \ + unzip \ + /tmp/transmissionic.zip -d \ + / && \ curl -o \ /tmp/combustion.zip -L \ "https://github.com/Secretmapper/combustion/archive/release.zip" && \ @@ -50,8 +57,7 @@ RUN \ /tmp/combustion.zip -d \ / && \ mkdir -p /tmp/twctemp && \ - TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]') && \ + TWCVERSION=$(curl -s "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" | jq -r .tag_name) && \ curl -o \ /tmp/twc.tar.gz -L \ "https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 67c003e..6ea1fe3 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -43,6 +43,13 @@ RUN \ make && \ install -v -m755 unrar /usr/local/bin && \ echo "**** install third party themes ****" && \ + TRANSMISSIONIC_VERSION=$(curl -s "https://api.github.com/repos/6c65726f79/Transmissionic/releases/latest" | jq -r .tag_name) && \ + curl -o \ + /tmp/transmissionic.zip -L \ + "https://github.com/6c65726f79/Transmissionic/releases/download/${TRANSMISSIONIC_VERSION}/Transmissionic-webui-${TRANSMISSIONIC_VERSION}.zip" && \ + unzip \ + /tmp/transmissionic.zip -d \ + / && \ curl -o \ /tmp/combustion.zip -L \ "https://github.com/Secretmapper/combustion/archive/release.zip" && \ @@ -50,8 +57,7 @@ RUN \ /tmp/combustion.zip -d \ / && \ mkdir -p /tmp/twctemp && \ - TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]') && \ + TWCVERSION=$(curl -s "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" | jq -r .tag_name) && \ curl -o \ /tmp/twc.tar.gz -L \ "https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" && \ diff --git a/readme-vars.yml b/readme-vars.yml index 4711ef7..dd8a7f1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -40,7 +40,7 @@ cap_add_param: false # optional container parameters opt_param_usage_include_env: true opt_param_env_vars: - - { env_var: "TRANSMISSION_WEB_HOME", env_value: "/combustion-release/", desc: "Specify an alternative UI options are [`/combustion-release/`](https://github.com/Secretmapper/combustion), [`/transmission-web-control/`](https://github.com/ronggang/transmission-web-control), [`/kettu/`](https://github.com/endor/kettu) and [`/flood-for-transmission/`](https://github.com/johman10/flood-for-transmission)." } + - { env_var: "TRANSMISSION_WEB_HOME", env_value: "/combustion-release/", desc: "Specify an alternative UI options are [`/combustion-release/`](https://github.com/Secretmapper/combustion), [`/transmission-web-control/`](https://github.com/ronggang/transmission-web-control), [`/kettu/`](https://github.com/endor/kettu), [`/flood-for-transmission/`](https://github.com/johman10/flood-for-transmission), and [`/web/`](https://github.com/6c65726f79/Transmissionic)." } - { env_var: "USER", env_value: "username", desc: "Specify an optional username for the interface" } - { env_var: "PASS", env_value: "password", desc: "Specify an optional password for the interface" } - { env_var: "WHITELIST", env_value: "iplist", desc: "Specify an optional list of comma separated ip whitelist. Fill rpc-whitelist setting."} @@ -84,6 +84,7 @@ app_setup_block: | # changelog changelogs: + - { date: "03.04.22:", desc: "Add Transmissionic as a UI option." } - { date: "21.02.22:", desc: "Build unrar from source, rebase to Alpine 3.15, add symlinks neeeded for TWC. Credit @alexbelgium" } - { 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." } @@ -109,7 +110,7 @@ changelogs: - { date: "25.07.17:", desc: "Add rsync package." } - { date: "27.05.17:", desc: "Rebase to alpine linux 3.6." } - { date: "06.02.17:", desc: "Rebase to alpine linux 3.5." } - - { date: "15.01.17:", desc: "Add p7zip, tar , unrar and unzip packages." } + - { date: "15.01.17:", desc: "Add p7zip, tar, unrar, and unzip packages." } - { date: "16.10.16:", desc: "Blocklist autoupdate with optional authentication." } - { date: "14.10.16:", desc: "Add version layer informationE." } - { date: "23.09.16:", desc: "Add information about securing the webui to README." }