Basic web interface - work in process

.github/workflows/deploy.yml

@@ -302,8 +302,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
-          releaseName: "App v__VERSION__"
+          tagName: SDREHub-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
+          releaseName: "SDR-E Hub v__VERSION__"
           releaseBody: "See the assets to download this version and install."
           releaseDraft: false
           prerelease: false
@@ -333,6 +333,7 @@ jobs:
       get_version_method: cargo_toml_file_in_repo:file=/Cargo.toml
       cache_enabled: true
       cache_path: ./bin/
+      cache_key: ${{ github.run_id }}
 
     secrets:
       ghcr_token: ${{ secrets.GITHUB_TOKEN }}
@@ -360,6 +361,7 @@ jobs:
       get_version_method: cargo_toml_file_in_repo:file=/Cargo.toml
       cache_enabled: true
       cache_path: ./bin/
+      cache_key: ${{ github.run_id }}
       docker_latest_tag: test
     secrets:
       ghcr_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/on_pr.yaml

@@ -316,9 +316,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
-          releaseName: "App v__VERSION__"
-          releaseBody: "See the assets to download this version and install."
-          releaseDraft: true
-          prerelease: false
+          # tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
+          # releaseName: "App v__VERSION__"
+          # releaseBody: "See the assets to download this version and install."
+          # releaseDraft: true
+          # prerelease: false
           args: ${{ matrix.args }}

Cargo.toml

@@ -21,7 +21,7 @@ homepage = "https://github.com/sdr-enthusiasts/sdre-hub"
 repository = "https://github.com/sdr-enthusiasts/sdre-hub"
 readme = "README.MD"
 license = "MIT"
-rust-version = "1.77.2"
+rust-version = "1.78.0"
 keywords = [
     "acars",
     "vdlm",

Dockerfile

@@ -6,7 +6,7 @@ COPY ./bin/sdre-hub.armv7/sdre-hub /opt/sdre-hub.armv7
 COPY ./bin/sdre-hub.arm64/sdre-hub /opt/sdre-hub.arm64
 COPY ./bin/sdre-hub.amd64/sdre-hub /opt/sdre-hub.amd64
 COPY ./bin/sh-frontend /opt/sh-frontend
-
+ENV SH_DATA_PATH="/opt/sdre-hub-data"
 # hadolint ignore=DL3008,DL3003,SC1091
 RUN set -x && \
     KEPT_PACKAGES=() && \

Dockerfile.build_binary

@@ -1,4 +1,4 @@
-FROM rust:1.77.2 as builder
+FROM rust:1.78.0 as builder
 ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
 WORKDIR /tmp/sdre-hub
 # hadolint ignore=DL3008,DL3003,SC1091,DL4006,DL3009

Dockerfile.build_frontend

@@ -1,4 +1,4 @@
-FROM rust:1.77.2 as builder
+FROM rust:1.78.0 as builder
 WORKDIR /tmp/sdre-hub
 # hadolint ignore=DL3008,DL3003,SC1091,DL4006,DL3009
 RUN set -x && \

Dockerfile.local

@@ -1,9 +1,9 @@
-FROM rust:1.77.2 as builder
+FROM rust:1.78.0 as builder
 WORKDIR /tmp/sdre-hub
 # hadolint ignore=DL3008,DL3003,SC1091,DL4006
 RUN set -x && \
     apt-get update && \
-    apt-get install -y --no-install-recommends libzmq3-dev \
+    apt-get install -y --no-install-recommends libzmq3-dev && \
     curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash && \
     curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh && \
     cargo binstall trunk wasm-bindgen-cli --no-confirm && \
@@ -23,6 +23,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 COPY rootfs /
 COPY --from=builder /tmp/sdre-hub/target/release/sdre-hub /opt/sdre-hub
 COPY --from=builder /tmp/sdre-hub/sh-frontend/dist /opt/sh-frontend
+ENV SH_DATA_PATH="/opt/sdre-hub-data"
 # hadolint ignore=DL3008,DL3003,SC1091
 RUN set -x && \
     KEPT_PACKAGES=() && \

README.md

@@ -30,6 +30,7 @@ Sorry, there is no migration path from ACARS Hub to SDR-E Hub. The data that ACA
   - [x] Application build
   - [ ] Manage settings from the web interface
   - [x] GitHub CI
+  - [ ] FIXME/TODO Cleanup
 - [ ] Alpha 2
   - [ ] Connect to data providers
     - [ ] ADSB
@@ -39,13 +40,16 @@ Sorry, there is no migration path from ACARS Hub to SDR-E Hub. The data that ACA
     - [ ] Satellite ACARS
   - [ ] Combine data from data providers and provide a state machine to manage data
   - [ ] Display data on the web interface
+  - [ ] FIXME/TODO Cleanup
 - [ ] Alpha 3
   - [ ] Implement database storage
     - [ ] RRD style data storage for relevant stats
     - [ ] SQL storage for historical data
     - [ ] General stats
+  - [ ] FIXME/TODO Cleanup
 - [ ] Beta 1
   - [ ] Focus on interface; clean it up, mobile functionality, etc
+  - [ ] FIXME/TODO Cleanup
 
 ## Thank you
 

rootfs/etc/nginx.sdrehub/sites-enabled/sdrehub

@@ -19,7 +19,7 @@ server {
   access_log off;
 
   # cache all of the files
-  location ~ \.(css|js|png|jpg|jpeg|gif|ico|woff|woff2|ttf|svg|eot|otf|map|mjs|mp3|wasm)$ {
+  location ~ \.(css|js|png|jpg|jpeg|gif|ico|woff|woff2|ttf|svg|eot|otf|map|mjs|mp3|wasm|webmanifest)$ {
     expires 30d;
     add_header Cache-Control "public";
     root /opt/sh-frontend;

rootfs/etc/s6-overlay/scripts/01-config-check

@@ -1,12 +1,17 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
+#!/bin/bash
+## !/command/with-contenv bash
+## shellcheck shell=bash
 
 # check the environment and see if there are any SH_* variables set
 # if so, warn the user that they really should be mapping a file
 # to /opt/sdre-hub-data and using /opt/sdre-hub-data/sh_config.toml
 
 SH_DATA=$(env | grep '^SH_')
 
+# remove SH_DATA_PATH, if it exists in SH_DATA from the list of variables to check
+
+SH_DATA=$(echo "$SH_DATA" | grep -v '^SH_DATA_PATH')
+
 if [ -n "$SH_DATA" ]; then
   echo "[01-config-check] WARNING: You have SH_* environment variables set. You should be using a config file instead."
   echo "                  Please map a directory to /opt/sdre-hub-data and use /opt/sdre-hub-data/sh_config.toml"

rootfs/etc/s6-overlay/scripts/nginx

@@ -1,13 +1,9 @@
 #!/command/with-contenv bash
 #shellcheck shell=bash
 
-# shellcheck disable=SC2016
-echo "Starting web proxy service" | stdbuf -oL awk '{print "[nginx       ] " strftime("%Y/%m/%d %H:%M:%S", systime()) " " $0}'
+source /scripts/common
+s6wrap=(s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args)
 
-
-# shellcheck disable=SC2016
 mkdir -p /var/log/nginx
-# TODO: Run this via wiede's script
-# shellcheck disable=SC2016
-exec \
-/usr/sbin/nginx 2>&1 | stdbuf -oL awk '{print "[nginx       ] " strftime("%Y/%m/%d %H:%M:%S", systime()) " " $0}'
+
+"${s6wrap[@]}" /usr/sbin/nginx