diff options
| author |  Anshul Gupta <ansg191@anshulg.com>
| 2024-06-29 22:13:51 -0700 |
|---|---|---|
| committer | Anshul Gupta <ansg191@anshulg.com>
| 2024-09-06 16:04:33 -0700 |
| commit | 8e515166b41183b96b00d6807e3962d99c2ce1f1 (patch) | |
| tree | fc1aec92da715ec13cd6b2530d37aca0e4358f8e | |
| parent | eb07fcece4aa9cd5eed3fad54e7d0208580b4c34 (diff) | |
| download | docker-nzbhydra2-8e515166b41183b96b00d6807e3962d99c2ce1f1.tar.gz docker-nzbhydra2-8e515166b41183b96b00d6807e3962d99c2ce1f1.tar.zst docker-nzbhydra2-8e515166b41183b96b00d6807e3962d99c2ce1f1.zip | |
Make arch Dockerfiles align
# Conflicts:
# Dockerfile.aarch64
diff --git a/Dockerfile b/Dockerfile
index 158b28f..b5d5ccd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,8 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
+ARG TARGETARCH
+
# set version label
ARG BUILD_DATE
ARG VERSION
@@ -28,7 +30,7 @@ RUN \
NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
curl -o \
/tmp/nzbhydra2.zip -L \
- "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-amd64-linux.zip" && \
+ "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-${TARGETARCH}-linux.zip" && \
mkdir -p /app/nzbhydra2 && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 5d6ea33..b5d5ccd 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,8 @@
# syntax=docker/dockerfile:1
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble
+FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
+
+ARG TARGETARCH
# set version label
ARG BUILD_DATE
@@ -28,7 +30,7 @@ RUN \
NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
curl -o \
/tmp/nzbhydra2.zip -L \
- "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-arm64-linux.zip" && \
+ "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-${TARGETARCH}-linux.zip" && \
mkdir -p /app/nzbhydra2 && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Dockerfile.aarch64 | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -2,6 +2,8 @@ FROM ghcr.io/linuxserver/baseimage-ubuntu:noble +ARG TARGETARCH + # set version label ARG BUILD_DATE ARG VERSION @@ -28,7 +30,7 @@ RUN \ NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \ curl -o \ /tmp/nzbhydra2.zip -L \ - "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-amd64-linux.zip" && \ + "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-${TARGETARCH}-linux.zip" && \ mkdir -p /app/nzbhydra2 && \ unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \ chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5d6ea33..b5d5ccd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,8 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble +FROM ghcr.io/linuxserver/baseimage-ubuntu:noble + +ARG TARGETARCH # set version label ARG BUILD_DATE @@ -28,7 +30,7 @@ RUN \ NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \ curl -o \ /tmp/nzbhydra2.zip -L \ - "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-arm64-linux.zip" && \ + "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-${TARGETARCH}-linux.zip" && \ mkdir -p /app/nzbhydra2 && \ unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \ chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \ |