Update master with Transmission 4 (#2576)

* Image with Transmission 4.0.0-beta * Build in separate stage * Updated to beta2 * Update Dockerfile * Updated transmission to 4.0.0 release * Update Dockerfile * update beta (#2554) * Bump docker/build-push-action from 3 to 4 (#2534) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Socks5 example doc (#2541) * fixing some heading sizes * adding socks5-proxy example --------- Co-authored-by: Jonathan Fair <[email protected]> * Docs: add capabilities for Podman to tips&tricks (#2546) Co-authored-by: Tomas Vik <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JtMotoX <[email protected]> Co-authored-by: Jonathan Fair <[email protected]> Co-authored-by: Tomas Vik <[email protected]> * Update Dockerfile 4.0.2 * Update configure-openvpn.sh (#2567) Same changes to master going to beta for beta tests w latest Transmission * Transmission->4.0.3 * prep new master (#2575) * Bump docker/build-push-action from 3 to 4 (#2534) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Socks5 example doc (#2541) * fixing some heading sizes * adding socks5-proxy example --------- Co-authored-by: Jonathan Fair <[email protected]> * Docs: add capabilities for Podman to tips&tricks (#2546) Co-authored-by: Tomas Vik <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JtMotoX <[email protected]> Co-authored-by: Jonathan Fair <[email protected]> Co-authored-by: Tomas Vik <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Kristian Haugene <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JtMotoX <[email protected]> Co-authored-by: Jonathan Fair <[email protected]> Co-authored-by: Tomas Vik <[email protected]> Co-authored-by: Derek Gordon <[email protected]>
haugene · Apr 14, 2023 · c763be0 · c763be0
1 parent 481e830
commit c763be0
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 21 deletions.
diff --git a/.github/workflows/docker-image-builds.yml b/.github/workflows/docker-image-builds.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - dev
+      - beta
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 

diff --git a/Dockerfile b/Dockerfile
@@ -16,16 +16,55 @@ RUN apk --no-cache add curl jq \
     && mkdir /opt/transmission-ui/transmission-web-control \
     && curl -sL $(curl -s https://api.github.com/repos/ronggang/transmission-web-control/releases/latest | jq --raw-output '.tarball_url') | tar -C /opt/transmission-ui/transmission-web-control/ --strip-components=2 -xz
 
-FROM ubuntu:22.04
+
+FROM ubuntu:22.04 AS base
+
+RUN set -ex; \
+    apt-get update; \
+    apt-get dist-upgrade -y; \
+    apt-get install -y --no-install-recommends \
+      tzdata \
+      iproute2 \
+      net-tools \
+      nano \
+      ca-certificates \
+      curl \
+      libcurl4-openssl-dev \
+      libdeflate-dev \
+      libevent-dev \
+      libfmt-dev \
+      libminiupnpc-dev \
+      libnatpmp-dev \
+      libpsl-dev \
+      libssl-dev
+
+FROM base as TransmissionBetaBuilder
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y curl \
+    build-essential automake autoconf libtool pkg-config intltool libcurl4-openssl-dev \
+    libglib2.0-dev libevent-dev libminiupnpc-dev libgtk-3-dev libappindicator3-dev libssl-dev cmake xz-utils
+
+
+RUN mkdir -p /home/transmission4/ && cd /home/transmission4/ \
+  && curl -L -o transmission4.tar.xz "https://github.com/transmission/transmission/releases/download/4.0.3/transmission-4.0.3.tar.xz" \
+  && tar -xf transmission4.tar.xz && cd transmission-4.0.3* && mkdir build && cd build \
+  && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make && make install
+
+
+FROM base
 
 VOLUME /data
 VOLUME /config
 
 COPY --from=TransmissionUIs /opt/transmission-ui /opt/transmission-ui
+COPY --from=TransmissionBetaBuilder /usr/local/bin /usr/local/bin
+COPY --from=TransmissionBetaBuilder /usr/local/share /usr/local/share
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
-    dumb-init openvpn transmission-daemon transmission-cli privoxy \
+    dumb-init openvpn privoxy \
     tzdata dnsutils iputils-ping ufw openssh-client git jq curl wget unrar unzip bc \
     && ln -s /usr/share/transmission/web/style /opt/transmission-ui/transmission-web-control \
     && ln -s /usr/share/transmission/web/images /opt/transmission-ui/transmission-web-control \

diff --git a/openvpn/ovpn/configure-openvpn.sh b/openvpn/ovpn/configure-openvpn.sh
@@ -37,23 +37,15 @@ cd /etc/openvpn/ovpn
 find /etc/openvpn/ovpn -type f ! -name "*.sh" -delete
 
 # Download and extract wanted bundle into temporary file
-echo "Downloading OpenVPN config bundle into temporary file $tmp_file"
-#svn not baked into docker, leave for another day
-#svn export https://github.com/haugene/vpn-configs-contrib/tree/main/openvpn/"
-
-wget -c https://github.com/haugene/vpn-configs-contrib/archive/refs/heads/main.zip  -P /tmp/
-echo "Extract OpenVPN config bundle into $VPN_PROVIDER_HOME"
-unzip /tmp/main.zip "vpn-configs-contrib-main/openvpn/ovpn/*" -d /tmp/
-mv /tmp/vpn-configs-contrib-main/openvpn/ovpn/* /etc/openvpn/ovpn
-rm /tmp/vpn-configs-contrib-main/openvpn/ovpn/ -R
-
-#test repo
-#wget -c https://github.com/derekcentrico/vpn-configs-contrib-ovpnwork/archive/refs/heads/main.zip -P /tmp/
-#unzip /tmp/main.zip "vpn-configs-contrib-ovpnwork-main/openvpn/ovpn/*" -d /tmp/
-#mv /tmp/vpn-configs-contrib-ovpnwork-main/openvpn/ovpn/* /etc/openvpn/ovpn
-#rm /tmp/vpn-configs-contrib-ovpnwork-main/openvpn/ovpn/ -R
-
-rm /tmp/main.zip
+echo "creating temp folder"
+mkdir /tmp/ovpnxtract/
+echo "entering temp folder"
+cd /tmp/ovpnxtract/
+git clone https://github.com/haugene/vpn-configs-contrib.git 
+echo "moving content"
+mv /tmp/ovpnxtract/vpn-configs-contrib/openvpn/ovpn/* /etc/openvpn/ovpn
+echo "deleting temp folder"
+rm -rf /tmp/ovpnxtract/
 
 
 #pattern=$OVPN_CONNECTION.$OVPN_COUNTRY.$OVPN_CITY.$OVPN_PROTOCOL
@@ -66,4 +58,4 @@ OPENVPN_CONFIG=$OVPN_CONNECTION.$OVPN_COUNTRY.$OVPN_CITY.$OVPN_PROTOCOL
 #else
 #		echo "There is no available config matching provided options!"
 #		exit 3
-#fi
+#fi
diff --git a/transmission/start.sh b/transmission/start.sh
@@ -85,7 +85,7 @@ else
 fi
 
 echo "STARTING TRANSMISSION"
-exec su --preserve-environment ${RUN_AS} -s /bin/bash -c "/usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile $LOGFILE" &
+exec su --preserve-environment ${RUN_AS} -s /bin/bash -c "/usr/local/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile $LOGFILE" &
 
 # Configure port forwarding if applicable
 if [[ -x /etc/openvpn/${OPENVPN_PROVIDER,,}/update-port.sh && (-z $DISABLE_PORT_UPDATER || "false" = "$DISABLE_PORT_UPDATER") ]]; then
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
         branches:
           - master
           - dev
+          - beta
         tags:
           - 'v[0-9]+.[0-9]+.[0-9]+'
@@ Expand Down @@