chore: update s6 overlay version (#41)

- fix readme title level - add env var for all versions
Thom-x · Jan 25, 2021 · c2a19a3 · c2a19a3
1 parent ff87748
commit c2a19a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -88,9 +88,15 @@ FROM debian:buster-slim as serve
 
 ENV DEBIAN_VERSION buster
 ENV RTL_SDR_VERSION 0.6.0
-ENV FR24FEED_VERSION 1.0.18-5
 
-MAINTAINER maugin.thomas@gmail.com
+# force version 1.0.18-5 for amd64 because mlat is not working anymore for latest versions
+ENV FR24FEED_AMD64_VERSION 1.0.18-5
+# force version 1.0.25-3 for armhf and armel because of broken version for these architectures
+ENV FR24FEED_ARMHF_VERSION 1.0.25-3
+ENV FR24FEED_ARMEL_VERSION 1.0.25-3
+ENV S6_OVERLAY_VERSION v2.1.0.2
+
+LABEL maintainer="maugin.thomas@gmail.com"
 
 RUN apt-get update && \
     # rtl-sdr

diff --git a/README.md b/README.md
@@ -161,7 +161,7 @@ Ex : `-e "HTML_SITE_NAME=My site"`
 | `RTL_TCP_REMOTE_PORT`                | empty                    | Port of rtl_tcp server                                            |
 
 
-### Terrain-limit rings (optional):
+## Terrain-limit rings (optional):
 If you don't need this feature ignore this.
 
 Create a panorama for your receiver location on http://www.heywhatsthat.com.

diff --git a/build/fr24feed.sh b/build/fr24feed.sh
@@ -2,15 +2,15 @@
 arch=$(dpkg --print-architecture)
 case $arch in
   armhf)
-    url=https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_1.0.25-3_armhf.tgz # force version 1.0.25-3 because of broken version for rpi
+    url=https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_${FR24FEED_ARMHF_VERSION}_armhf.tgz # force version 1.0.25-3 because of broken version for rpi
     dirname=fr24feed_armhf
     ;;
   armel)
-    url=https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_1.0.25-3_armhf.tgz # force version 1.0.25-3 because of broken version for rpi
+    url=https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_${FR24FEED_ARMEL_VERSION}_armhf.tgz # force version 1.0.25-3 because of broken version for rpi
     dirname=fr24feed_armhf
     ;;
   amd64)
-    url=https://repo-feed.flightradar24.com/linux_x86_64_binaries/fr24feed_${FR24FEED_VERSION}_amd64.tgz
+    url=https://repo-feed.flightradar24.com/linux_x86_64_binaries/fr24feed_${FR24FEED_AMD64_VERSION}_amd64.tgz
     dirname=fr24feed_amd64
     ;;
   *)

diff --git a/build/s6-overlay.sh b/build/s6-overlay.sh
@@ -3,13 +3,13 @@ arch=$(dpkg --print-architecture)
 
 case $arch in
   armhf)
-    url=https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-armhf.tar.gz
+    url=https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-armhf.tar.gz
     ;;
   armel)
-    url=https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-arm.tar.gz
+    url=https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-arm.tar.gz
     ;;
   amd64)
-    url=https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz
+    url=https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz
     ;;
   *)
     exit 1