From e065cd9d5be1d0ee72b60e7869b23f9de1004be0 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 25 Jan 2020 16:55:26 -0800 Subject: [PATCH] tarballs no longer have embedded zip --- Dockerfile | 11 ++++------- Dockerfile.aarch64 | 11 ++++------- Dockerfile.armhf | 11 ++++------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd58ff9..052ca1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,7 @@ RUN \ apt-get install -y \ jq \ libicu60 \ - libssl1.0 \ - unzip && \ + libssl1.0 && \ echo "**** install ombi ****" && \ mkdir -p \ /opt/ombi && \ @@ -27,12 +26,10 @@ RUN \ OMBI_DURL=$(curl -s https://api.github.com/repos/tidusjar/Ombi.Releases/releases/tags/"${OMBI_RELEASE}" \ |jq -r '.assets[].browser_download_url' |grep 'linux-x64-') && \ curl -o \ - /tmp/ombi-src.tar.gz -L \ + /tmp/ombi.tar.gz -L \ "${OMBI_DURL}" && \ - tar xzf /tmp/ombi-src.tar.gz -C \ - /tmp/ && \ - unzip /tmp/linux-64/Ombi.zip \ - -d /opt/ombi/ && \ + tar xzf /tmp/ombi.tar.gz -C \ + /opt/ombi && \ chmod +x /opt/ombi/Ombi && \ echo "**** clean up ****" && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 691e86e..8d30771 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,8 +15,7 @@ RUN \ apt-get install -y \ jq \ libicu60 \ - libssl1.0 \ - unzip && \ + libssl1.0 && \ echo "**** install ombi ****" && \ mkdir -p \ /opt/ombi && \ @@ -27,12 +26,10 @@ RUN \ OMBI_DURL=$(curl -s https://api.github.com/repos/tidusjar/Ombi.Releases/releases/tags/"${OMBI_RELEASE}" \ |jq -r '.assets[].browser_download_url' |grep 'linux-arm64-') && \ curl -o \ - /tmp/ombi-src.tar.gz -L \ + /tmp/ombi.tar.gz -L \ "${OMBI_DURL}" && \ - tar xzf /tmp/ombi-src.tar.gz -C \ - /tmp/ && \ - unzip /tmp/linux-arm64/Ombi.zip \ - -d /opt/ombi/ && \ + tar xzf /tmp/ombi.tar.gz -C \ + /opt/ombi && \ chmod +x /opt/ombi/Ombi && \ echo "**** clean up ****" && \ rm -rf \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 25351ae..649f210 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -15,8 +15,7 @@ RUN \ apt-get install -y \ jq \ libicu60 \ - libssl1.0 \ - unzip && \ + libssl1.0 && \ echo "**** install ombi ****" && \ mkdir -p \ /opt/ombi && \ @@ -27,12 +26,10 @@ RUN \ OMBI_DURL=$(curl -s https://api.github.com/repos/tidusjar/Ombi.Releases/releases/tags/"${OMBI_RELEASE}" \ |jq -r '.assets[].browser_download_url' |grep 'linux-arm-') && \ curl -o \ - /tmp/ombi-src.tar.gz -L \ + /tmp/ombi.tar.gz -L \ "${OMBI_DURL}" && \ - tar xzf /tmp/ombi-src.tar.gz -C \ - /tmp/ && \ - unzip /tmp/linux-arm/Ombi.zip \ - -d /opt/ombi/ && \ + tar xzf /tmp/ombi.tar.gz -C \ + /opt/ombi && \ chmod +x /opt/ombi/Ombi && \ echo "**** clean up ****" && \ rm -rf \