switch to tags

This reverts commit 31a1ad4e72, reversing
changes made to f8ee0b97d6.

.drone.yml

@@ -0,0 +1,78 @@
+---
+kind: pipeline
+type: kubernetes
+name: linux-amd64
+platform:
+  os: linux
+  arch: amd64
+node_selector:
+  kubernetes.io/arch: amd64
+trigger:
+  event:
+    - tag
+steps:
+- name: docker
+  image: plugins/docker
+  settings:
+    dockerfile: docker/Dockerfile.amd64
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    repo: bottledpills/deluge-openvpn
+    auto_tag: true
+    auto_tag_suffix: linux-amd64
+    platform: 'linux/amd64'
+
+---
+kind: pipeline
+type: kubernetes
+name: linux-arm64
+platform:
+  os: linux
+  arch: arm64
+node_selector:
+  kubernetes.io/arch: arm64
+trigger:
+  event:
+    - tag
+steps:
+- name: docker
+  image: plugins/docker
+  settings:
+    dockerfile: docker/Dockerfile.arm64
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    repo: bottledpills/deluge-openvpn
+    auto_tag: true
+    auto_tag_suffix: linux-arm64
+    platform: 'linux/arm64'
+
+---
+kind: pipeline
+type: kubernetes
+name: manifest
+platform:
+  os: linux
+  arch: arm64
+node_selector:
+  kubernetes.io/arch: arm64
+trigger:
+  event:
+    - tag
+steps:
+- name: manifest
+  image: plugins/manifest
+  settings:
+    spec: docker/manifest.tmpl
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    auto_tag: true
+    ignore_missing: true
+depends_on:
+  - linux-amd64
+  - linux-arm64

README.md

@@ -1,7 +1,7 @@
 # OpenVPN and Deluge with WebUI
 
-![Build/Push (master)](https://github.com/ebrianne/docker-deluge-openvpn/workflows/Build/Push%20(master)/badge.svg?branch=master)
-[![Docker Pulls](https://img.shields.io/docker/pulls/ebrianne/docker-deluge-openvpn.svg)](https://hub.docker.com/r/ebrianne/docker-deluge-openvpn/)
+[![Build Status](https://drone.beatrice.wtf/api/badges/bea/docker-deluge-openvpn/status.svg)](https://drone.beatrice.wtf/bea/docker-deluge-openvpn)
+[![Docker Pulls](https://img.shields.io/docker/pulls/bottledpills/deluge-openvpn.svg)](https://hub.docker.com/r/bottledpills/deluge-openvpn/)
 
 ## Acknowledgments
 

docker/Dockerfile.amd64

@@ -0,0 +1,70 @@
+FROM ubuntu:22.04
+
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV DUMB_INIT_BASE_URL="https://github.com/Yelp/dumb-init/releases/download/v1.2.5"
+
+# Step 1: Install prerequisites
+RUN apt-get update && apt-get -y install curl software-properties-common
+
+# Step 2: Add the Deluge PPA and update apt cache
+RUN add-apt-repository -u ppa:deluge-team/stable && apt-get update
+
+# Step 3: Download dumb-init asset for amd64
+RUN curl -Lo /tmp/dumb-init "$DUMB_INIT_BASE_URL/dumb-init_1.2.5_amd64.deb"
+
+# Step 4: Install dumb-init for amd64
+RUN dpkg-deb -x /tmp/dumb-init /tmp/dumb-init-dir && \
+    cp /tmp/dumb-init-dir/usr/bin/dumb-init /usr/local/bin/dumb-init && \
+    chmod +x /usr/local/bin/dumb-init && \
+    rm -rf /tmp/dumb-init /tmp/dumb-init-dir
+
+# Step 5: Install other dependencies
+RUN apt-get -y install iputils-ping dnsutils bash jq net-tools openvpn curl ufw deluged deluge-web p7zip-full unrar unzip
+
+# Step 6: Clean up apt cache and temporary files
+RUN rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/*
+
+# Step 7: Add the user "abc"
+RUN groupmod -g 1000 users && \
+    useradd -u 911 -U -d /config -s /bin/false abc && \
+    usermod -G users abc
+
+# Step 8: Copy configuration and scripts
+COPY root/ /
+
+# Step 9: Set environment variables
+ENV OPENVPN_USERNAME=**None** \
+    OPENVPN_PASSWORD=**None** \
+    OPENVPN_PROVIDER=**None** \
+    GLOBAL_APPLY_PERMISSIONS=true \
+    TZ=Europe/Berlin \
+    DELUGE_WEB_PORT=8112 \
+    DELUGE_DEAMON_PORT=58846 \
+    DELUGE_DOWNLOAD_DIR=/download/completed \
+    DELUGE_INCOMPLETE_DIR=/download/incomplete \
+    DELUGE_TORRENT_DIR=/download/torrents \
+    DELUGE_WATCH_DIR=/download/watch \
+    CREATE_TUN_DEVICE=true \
+    ENABLE_UFW=false \
+    UFW_ALLOW_GW_NET=false \
+    UFW_EXTRA_PORTS= \
+    UFW_DISABLE_IPTABLES_REJECT=false \
+    PUID= \
+    PGID= \
+    UMASK=022 \
+    PEER_DNS=true \
+    PEER_DNS_PIN_ROUTES=true \
+    DROP_DEFAULT_ROUTE= \
+    HEALTH_CHECK_HOST=google.com \
+    LOG_TO_STDOUT=false \
+    DELUGE_LISTEN_PORT_LOW=53394 \
+    DELUGE_LISTEN_PORT_HIGH=53404 \
+    DELUGE_OUTGOING_PORT_LOW=63394 \
+    DELUGE_OUTGOING_PORT_HIGH=63404
+
+# Step 10: Configure health check and expose ports
+HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh
+EXPOSE 8112 58846
+
+# Step 11: Set default command
+CMD ["/usr/local/bin/dumb-init", "/etc/openvpn/init.sh"]

docker/Dockerfile.arm64

@@ -1,28 +1,37 @@
 FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND="noninteractive"
+ENV DUMB_INIT_BASE_URL="https://github.com/Yelp/dumb-init/releases/download/v1.2.5"
 
-# Install prerequisites and curl
-RUN apt-get update && apt-get -y install curl software-properties-common && \
-    add-apt-repository -u ppa:deluge-team/stable && \
-    apt-get update && \
-    # Download and install dumb-init manually based on architecture
-    arch=$(dpkg --print-architecture) && \
-    if [ "$arch" = "arm64" ]; then arch="aarch64"; fi && \
-    curl -Lo /tmp/dumb-init.deb "https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_${arch}.deb" && \
-    dpkg -i /tmp/dumb-init.deb && rm -f /tmp/dumb-init.deb && \
-    # Install other dependencies
-    apt-get -y install iputils-ping dnsutils bash jq net-tools openvpn curl ufw deluged deluge-web p7zip-full unrar unzip && \
-    echo "Cleanup" && \
-    rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/* && \
-    echo "Adding user" && \
-    groupmod -g 1000 users && \
+# Step 1: Install prerequisites
+RUN apt-get update && apt-get -y install curl software-properties-common
+
+# Step 2: Add the Deluge PPA and update apt cache
+RUN add-apt-repository -u ppa:deluge-team/stable && apt-get update
+
+# Step 3: Download dumb-init asset for arm64
+RUN curl -Lo /tmp/dumb-init "$DUMB_INIT_BASE_URL/dumb-init_1.2.5_aarch64"
+
+# Step 4: Install dumb-init for arm64
+RUN cp /tmp/dumb-init /usr/local/bin/dumb-init && \
+    chmod +x /usr/local/bin/dumb-init && \
+    rm -rf /tmp/dumb-init
+
+# Step 5: Install other dependencies
+RUN apt-get -y install iputils-ping dnsutils bash jq net-tools openvpn curl ufw deluged deluge-web p7zip-full unrar unzip
+
+# Step 6: Clean up apt cache and temporary files
+RUN rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/*
+
+# Step 7: Add the user "abc"
+RUN groupmod -g 1000 users && \
     useradd -u 911 -U -d /config -s /bin/false abc && \
     usermod -G users abc
 
-# Add configuration and scripts
+# Step 8: Copy configuration and scripts
 COPY root/ /
 
+# Step 9: Set environment variables
 ENV OPENVPN_USERNAME=**None** \
     OPENVPN_PASSWORD=**None** \
     OPENVPN_PROVIDER=**None** \
@@ -52,9 +61,9 @@ ENV OPENVPN_USERNAME=**None** \
     DELUGE_OUTGOING_PORT_LOW=63394 \
     DELUGE_OUTGOING_PORT_HIGH=63404
 
+# Step 10: Configure health check and expose ports
 HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh
-
-# Deluge Deamon and web
 EXPOSE 8112 58846
 
-CMD ["/usr/local/bin/dumb-init", "/etc/openvpn/init.sh"]
+# Step 11: Set default command
+CMD ["/usr/local/bin/dumb-init", "/etc/openvpn/init.sh"]

docker/manifest.tmpl

@@ -0,0 +1,12 @@
+image: bottledpills/deluge-openvpn:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+manifests:
+  -
+    image: bottledpills/deluge-openvpn:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: bottledpills/deluge-openvpn:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    platform:
+      architecture: arm64
+      os: linux