Merge pull request #39 from linuxserver/dev-arm

Remove Windows binaries from generic zip
Only chmod core if it exists
2023-01-22 21:24:24 +00:00 · 2023-01-22 20:14:17 +00:00 · 2023-01-22 19:59:28 +00:00 · 2023-01-22 19:56:38 +00:00 · 2023-01-22 19:55:36 +00:00 · 2023-01-22 19:54:48 +00:00
5 changed files with 12 additions and 7 deletions
@@ -29,11 +29,11 @@ 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}-linux.zip" && \
+    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-amd64-linux.zip" && \
  mkdir -p /app/nzbhydra2 && \
  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
  chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
-  chmod +x /app/nzbhydra2/core && \
+  if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
  echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
  mkdir -p /defaults && \
  curl -o \
@@ -29,11 +29,11 @@ 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}-linux.zip" && \
+    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-arm64-linux.zip" && \
  mkdir -p /app/nzbhydra2 && \
  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
  chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
-  chmod +x /app/nzbhydra2/core && \
+  if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
  echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
  mkdir -p /defaults && \
  curl -o \
@@ -29,11 +29,11 @@ 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}-linux.zip" && \
+    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-generic.zip" && \
  mkdir -p /app/nzbhydra2 && \
  unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
  chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
-  chmod +x /app/nzbhydra2/core && \
+  if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
  echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
  mkdir -p /defaults && \
  curl -o \
@@ -49,7 +49,10 @@ RUN \
    /app/nzbhydra2/upstart \
    /app/nzbhydra2/rc.d \
    /app/nzbhydra2/sysv \
-    /app/nzbhydra2/systemd
+    /app/nzbhydra2/systemd \
+    /app/nzbhydra2/WindowsService \
+    /app/nzbhydra2/NZBHydra2.exe \
+    "/app/nzbhydra2/NZBHydra2 Console.exe"

 # copy local files
 COPY root/ /
@@ -235,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **22.01.23:** - Update release URL for arch-specific packages.
 * **20.01.23:** - Update dependencies for v5.
 * **03.23.22:** - Upgrade JRE to 17, rebase to ubuntu.
 * **18.04.22:** - Rebase to Alpine 3.15.
@@ -56,6 +56,7 @@ app_setup_block: |
 # changelog

 changelogs:
+  - { date: "22.01.23:", desc: "Update release URL for arch-specific packages." }
  - { date: "20.01.23:", desc: "Update dependencies for v5." }
  - { date: "03.23.22:", desc: "Upgrade JRE to 17, rebase to ubuntu." }
  - { date: "18.04.22:", desc: "Rebase to Alpine 3.15." }
Author	SHA1	Message	Date
AdamandGitHub	8350054896	Merge pull request #39 from linuxserver/dev-arm	2023-01-22 21:24:24 +00:00
TheSpad	371eaa001b	Remove Windows binaries from generic zip	2023-01-22 20:14:17 +00:00
TheSpad	17f76ff225	Only chmod core if it exists	2023-01-22 19:59:28 +00:00
TheSpad	be5e598305	Do build armhf	2023-01-22 19:56:38 +00:00
TheSpad	984d1ce002	Fix errant space	2023-01-22 19:55:36 +00:00
TheSpad	d2a45dab21	Update release URL for arch-specific packages	2023-01-22 19:54:48 +00:00
AdamandGitHub	29d77d21ff	Merge pull request #34 from linuxserver/revert-33-revert-30-dev-v5	2023-01-21 12:01:03 +00:00
AdamandGitHub	b305e2ac4f	Revert "Revert "Update deps for v5 (dev)""	2023-01-20 21:06:03 +00:00
AdamandGitHub	83739880eb	Merge pull request #33 from linuxserver/revert-30-dev-v5	2023-01-20 20:46:52 +00:00
AdamandGitHub	9edb19e41a	Revert "Update deps for v5 (dev)"	2023-01-20 18:33:35 +00:00