chore(s6-overlay): use s6-overlay v3, use the new way to handles services etc for it (#73)

Author: Thom-x

Dockerfile

@@ -71,7 +71,7 @@ RUN ./sensible-build.sh ${DEBIAN_VERSION} && \
 # THTTPD
 FROM alpine:3.13.2 AS thttpd
 
-ARG THTTPD_VERSION=2.29
+ENV THTTPD_VERSION=2.29
 
 # Install all dependencies required for compiling thttpd
 RUN apk add gcc musl-dev make
@@ -95,14 +95,15 @@ ENV FR24FEED_AMD64_VERSION 1.0.25-3
 # 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
+ENV S6_OVERLAY_VERSION 3.0.0.2-2
 
 LABEL maintainer="maugin.thomas@gmail.com"
 
 RUN apt-get update && \
     # rtl-sdr
     apt-get install -y \
     wget \
+    xz-utils \
     devscripts \
     libusb-1.0-0-dev \
     pkg-config \
@@ -125,11 +126,10 @@ RUN apt-get update && \
     pkg-config \
     libncurses5-dev \
     libbladerf-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-# RTL-SDR
-WORKDIR /tmp
-RUN mkdir -p /etc/modprobe.d && \
+    rm -rf /var/lib/apt/lists/* && \
+    # RTL-SDR
+    cd /tmp && \
+    mkdir -p /etc/modprobe.d && \
     echo 'blacklist r820t' >> /etc/modprobe.d/raspi-blacklist.conf && \
     echo 'blacklist rtl2832' >> /etc/modprobe.d/raspi-blacklist.conf && \
     echo 'blacklist rtl2830' >> /etc/modprobe.d/raspi-blacklist.conf && \
@@ -141,20 +141,18 @@ RUN mkdir -p /etc/modprobe.d && \
     make && \
     make install && \
     ldconfig && \
-    rm -rf /tmp/rtl-sdr
-
-# Build & Install dependency tcl-tls from source code.
-# Install dependencies
-RUN apt-get update && \
+    rm -rf /tmp/rtl-sdr && \
+    # Build & Install dependency tcl-tls from source code.
+    # Install dependencies
+    apt-get update && \
     apt-get install -y \
     libssl-dev \
     tcl-dev \
     chrpath \
     netcat && \
-    rm -rf /var/lib/apt/lists/*
-
-## Clone source code, build & Install tcl-tls
-RUN cd /tmp && \
+    rm -rf /var/lib/apt/lists/* && \
+    # Clone source code, build & Install tcl-tls
+    cd /tmp && \
     git clone --depth 1 http://github.com/flightaware/tcltls-rebuild.git && \
     cd tcltls-rebuild && \
     ./prepare-build.sh ${DEBIAN_VERSION} && \
@@ -164,39 +162,38 @@ RUN cd /tmp && \
     dpkg -i tcl-tls_*.deb && \
     rm -rf /tmp/tcltls-rebuild
 
-# DUMP1090
-RUN mkdir -p /usr/lib/fr24/public_html/data
+# COPY ALL
 COPY --from=dump1090 /tmp/dump1090/dump1090 /usr/lib/fr24/
 COPY --from=dump1090 /tmp/dump1090/public_html_merged /usr/lib/fr24/public_html
-RUN rm /usr/lib/fr24/public_html/config.js && \
-    rm /usr/lib/fr24/public_html/layers.js
+COPY --from=piaware /tmp/piaware_builder /tmp/piaware_builder
+COPY --from=thttpd /thttpd/thttpd /
+ADD build /build
+ADD confd/confd.tar.gz /opt/confd/
 
+
+# DUMP1090
+RUN mkdir -p /usr/lib/fr24/public_html/data && \
+    rm /usr/lib/fr24/public_html/config.js && \
+    rm /usr/lib/fr24/public_html/layers.js && \
 # PIAWARE
-COPY --from=piaware /tmp/piaware_builder /tmp/piaware_builder
-RUN cd /tmp/piaware_builder && \
+    cd /tmp/piaware_builder && \
     dpkg -i piaware_*_*.deb && \
     rm /etc/piaware.conf && \
-    rm -rf /tmp/piaware_builder
-
+    rm -rf /tmp/piaware_builder && \
 # THTTPD
-COPY --from=thttpd /thttpd/thttpd /
-RUN find /usr/lib/fr24/public_html -type d -print0 | xargs -0 chmod 0755 && \
-    find /usr/lib/fr24/public_html -type f -print0 | xargs -0 chmod 0644
-
-ADD build /build
-
+    find /usr/lib/fr24/public_html -type d -print0 | xargs -0 chmod 0755 && \
+    find /usr/lib/fr24/public_html -type f -print0 | xargs -0 chmod 0644 && \
 # FR24FEED
-RUN /build/fr24feed.sh
-
+    /build/fr24feed.sh && \
 # CONFD
-ADD confd/confd.tar.gz /opt/confd/
-RUN ARCH=$(dpkg --print-architecture) && \
+    ARCH=$(dpkg --print-architecture) && \
     cp "/opt/confd/bin/confd-$ARCH" /opt/confd/bin/confd && \
     chmod +x /opt/confd/bin/confd && \
-    rm /opt/confd/bin/confd-*
-
+    rm /opt/confd/bin/confd-* && \
 # S6 OVERLAY
-RUN /build/s6-overlay.sh
+    /build/s6-overlay.sh && \
+# CLEAN
+    rm -rf /build
 
 COPY /root /
 

build/s6-overlay.sh

@@ -3,22 +3,24 @@ arch=$(dpkg --print-architecture)
 
 case $arch in
   armhf)
-    url=https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-armhf.tar.gz
+    url=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-armhf-${S6_OVERLAY_VERSION}.tar.xz
     ;;
   arm64)
-    url=https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-aarch64.tar.gz
+    url=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-aarch64-${S6_OVERLAY_VERSION}.tar.xz
     ;;
   armel)
-    url=https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-arm.tar.gz
+    url=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-arm-${S6_OVERLAY_VERSION}.tar.xz
     ;;
   amd64)
-    url=https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz
+    url=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64-${S6_OVERLAY_VERSION}.tar.xz
     ;;
   *)
     exit 1
     ;;
 esac
 
+wget -O /tmp/s6-overlay-noarch.tar.gz https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch-${S6_OVERLAY_VERSION}.tar.xz /tmp
+tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.gz && rm /tmp/s6-overlay-noarch.tar.gz
 wget -O /tmp/s6-overlay.tar.gz $url && \
-tar xzf /tmp/s6-overlay.tar.gz -C / && rm /tmp/s6-overlay.tar.gz
+tar -C / -Jxpf /tmp/s6-overlay.tar.gz && rm /tmp/s6-overlay.tar.gz
 

root/etc/confd/layers/templates/layers.js.tmpl

@@ -149,12 +149,16 @@ function createBaseLayers() {
                 }
         }
 
+        var nexrad_bottomLeft = ol.proj.fromLonLat([-171.0,9.0]);
+        var nexrad_topRight = ol.proj.fromLonLat([-51.0,69.0]);
+        var nexrad_extent = [nexrad_bottomLeft[0], nexrad_bottomLeft[1], nexrad_topRight[0], nexrad_topRight[1]];
         var nexrad = new ol.layer.Tile({
                 name: 'nexrad',
                 title: 'NEXRAD',
                 type: 'overlay',
                 opacity: 0.5,
-                visible: false
+                visible: false,
+                extent: nexrad_extent,
         });
         us.push(nexrad);
 
@@ -210,6 +214,9 @@ function createBaseLayers() {
                 });
             };
 
+        var dwd_bottomLeft = ol.proj.fromLonLat([1.9,46.2]);
+        var dwd_topRight = ol.proj.fromLonLat([16.0,55.0]);
+        var dwd_extent = [dwd_bottomLeft[0], dwd_bottomLeft[1], dwd_topRight[0], dwd_topRight[1]];
         var dwd = new ol.layer.Tile({
                 source: new ol.source.TileWMS({
                         url: 'https://maps.dwd.de/geoserver/wms',
@@ -224,6 +231,7 @@ function createBaseLayers() {
                 visible: false,
                 zIndex: 99,
                 maxZoom: 14,
+                exent: dwd_extent,
         });
 
         var refreshDwd = function () {

root/etc/cont-init.d/01-confd-fr24feed

@@ -0,0 +1,25 @@
+#!/command/with-contenv bash
+
+if [ "$SERVICE_ENABLE_FR24FEED" != "false" ]; then
+	default_value() {
+		key=${1//\-/_DASH_}
+		key=FR24FEED_${key^^}
+		eval "value=\${$key:-\$2}"
+		printf -v $key -- "$value"
+		export $key
+	}
+
+	default_value "receiver" "beast-tcp"
+	default_value "fr24key" "YOUR_KEY_HERE"
+	default_value "host" "127.0.0.1:30005"
+	default_value "bs" "no"
+	default_value "raw" "no"
+	default_value "logmode" "1"
+	default_value "logpath" "/tmp"
+	default_value "mlat" "yes"
+	default_value "mlat-without-gps" "yes"
+
+	if [ ! -f /etc/fr24feed.ini ]; then
+		/opt/confd/bin/confd -onetime -confdir "/etc/confd/fr24feed" -prefix "fr24feed" -backend env
+	fi
+fi

root/etc/cont-init.d/02-confd-piaware

@@ -0,0 +1 @@
+oneshot

root/etc/cont-init.d/03-confd-html

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/confd-fr24feed/script

root/etc/cont-init.d/04-confd-layers

@@ -0,0 +1,23 @@
+#!/command/with-contenv bash
+
+if [ "$SERVICE_ENABLE_HTTP" != "false" ]; then
+	default_value() {
+		key=${1//\-/_DASH_}
+		key=HTML_${key^^}
+		eval "value=\${$key:-\$2}"
+		printf -v $key -- "$value"
+		export $key
+	}
+
+	default_value "site_lat" "45.0"
+	default_value "site_lon" "9.0"
+	default_value "site_name" "My Radar Site"
+	default_value "default_tracker" "FlightAware"
+	default_value "receiver_stats_page_flightaware" ""
+	default_value "receiver_stats_page_flightradar24" ""
+	default_value "fr24_feeder_status_page" ""
+
+	if [ ! -f /usr/lib/fr24/public_html/config.js ]; then
+		/opt/confd/bin/confd -onetime -confdir "/etc/confd/html" -prefix "html" -backend env
+	fi
+fi

root/etc/cont-init.d/05-upintheair

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/confd-fr24feed/script

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/confd-html/script

root/etc/s6-overlay/s6-rc.d/confd-fr24feed/type

@@ -0,0 +1,7 @@
+#!/command/with-contenv bash
+
+if [ "$SERVICE_ENABLE_HTTP" != "false" ]; then
+	if [ ! -f /usr/lib/fr24/public_html/layers.js ]; then
+		/opt/confd/bin/confd -onetime -confdir "/etc/confd/layers" -prefix "layers" -backend env
+	fi
+fi

root/etc/s6-overlay/s6-rc.d/confd-fr24feed/up

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/confd-html/script

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/confd-layers/script

root/etc/s6-overlay/s6-rc.d/confd-html/type

@@ -0,0 +1,20 @@
+#!/command/with-contenv bash
+
+if [ "$SERVICE_ENABLE_PIAWARE" != "false" ]; then
+	default_value() {
+		key=${1//\-/_DASH_}
+		key=PIAWARE_${key^^}
+		eval "value=\${$key:-\$2}"
+		printf -v $key -- "$value"
+		export $key
+	}
+
+	default_value "feeder-id" "YOUR_FEEDER_ID"
+	default_value "receiver-type" "other"
+	default_value "receiver-host" "127.0.0.1"
+	default_value "receiver-port" "30005"
+
+	if [ ! -f /etc/piaware.conf ]; then
+		/opt/confd/bin/confd -onetime -confdir "/etc/confd/piaware" -prefix "piaware" -backend env
+	fi
+fi

root/etc/s6-overlay/s6-rc.d/confd-html/up

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/confd-layers/script

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/confd-piaware/script