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

Commit be65986

Browse files
committed
Fix tar extraction due to another packaging change
1 parent 52268b2 commit be65986

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

Dockerfile

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ RUN \
4242
| grep -E -m 1 -io 'https?://[^ ]+.tar.gz' \
4343
| awk -F "/" '{print $NF}' \
4444
| awk -F '_' '{print $4}'); \
45-
fi && \
46-
echo "**** App version is ${APP_VERSION} ****" && \
45+
fi && \
46+
echo "**** App version is ${APP_VERSION} ****" && \
4747
mkdir -p /tmp/omada && \
4848
OMADA_DOWNLOAD=$(curl -sL "https://www.tp-link.com/uk/support/download/omada-software-controller/$(echo $APP_VERSION | cut -c 1-2)" \
4949
| grep -E -io "https?://[^ ]+${APP_VERSION}_linux_x64.tar.gz") && \
@@ -52,16 +52,10 @@ RUN \
5252
/tmp/omada.tar.gz -L \
5353
${OMADA_DOWNLOAD} && \
5454
echo "**** unpack omada ****" && \
55-
if [ $(tar -tf /tmp/omada.tar.gz | awk -F "\n" '{print $1;exit}' | grep -i "omada") ]; then \
56-
tar xf \
57-
/tmp/omada.tar.gz -C \
58-
/tmp/omada/ --strip-components=1; \
59-
else \
60-
tar xf \
61-
/tmp/omada.tar.gz -C \
62-
/tmp/omada/; \
63-
fi && \
64-
echo "**** install omada ****" && \
55+
tar xf \
56+
/tmp/omada.tar.gz -C \
57+
/tmp/omada/ --strip-components=1 && \
58+
echo "**** install omada ****" && \
6559
mkdir -p /app/omada && \
6660
cd /tmp/omada && \
6761
for name in bin data properties keystore lib install.sh uninstall.sh; do cp ${name} /app/omada -r; done && \

0 commit comments

Comments
 (0)