Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

Commit

Permalink
Fix tar extraction due to another packaging change
Browse files Browse the repository at this point in the history
  • Loading branch information
thespad committed Oct 23, 2023
1 parent 52268b2 commit be65986
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ RUN \
| grep -E -m 1 -io 'https?://[^ ]+.tar.gz' \
| awk -F "/" '{print $NF}' \
| awk -F '_' '{print $4}'); \
fi && \
echo "**** App version is ${APP_VERSION} ****" && \
fi && \
echo "**** App version is ${APP_VERSION} ****" && \
mkdir -p /tmp/omada && \
OMADA_DOWNLOAD=$(curl -sL "https://www.tp-link.com/uk/support/download/omada-software-controller/$(echo $APP_VERSION | cut -c 1-2)" \
| grep -E -io "https?://[^ ]+${APP_VERSION}_linux_x64.tar.gz") && \
Expand All @@ -52,16 +52,10 @@ RUN \
/tmp/omada.tar.gz -L \
${OMADA_DOWNLOAD} && \
echo "**** unpack omada ****" && \
if [ $(tar -tf /tmp/omada.tar.gz | awk -F "\n" '{print $1;exit}' | grep -i "omada") ]; then \
tar xf \
/tmp/omada.tar.gz -C \
/tmp/omada/ --strip-components=1; \
else \
tar xf \
/tmp/omada.tar.gz -C \
/tmp/omada/; \
fi && \
echo "**** install omada ****" && \
tar xf \
/tmp/omada.tar.gz -C \
/tmp/omada/ --strip-components=1 && \
echo "**** install omada ****" && \
mkdir -p /app/omada && \
cd /tmp/omada && \
for name in bin data properties keystore lib install.sh uninstall.sh; do cp ${name} /app/omada -r; done && \
Expand Down

0 comments on commit be65986

Please sign in to comment.