Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixup nginx #31

Merged
merged 2 commits into from
May 9, 2024
Merged

fixup nginx #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
405dafa
fix location of nginx config file
wiedehopf May 9, 2024
324ad10
fix wait / service logic
wiedehopf May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM ghcr.io/sdr-enthusiasts/docker-baseimage:base

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# hadolint ignore=DL3008,DL3003,SC1091
RUN set -x && \
#
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/nginx.conf → rootfs/etc/nginx/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ http {
server {
server_name _;
listen 80 default_server;
root /var/www/html
root /var/www/html;

error_page 500 502 503 504 /50x.html;

Expand Down
3 changes: 2 additions & 1 deletion rootfs/etc/s6-overlay/scripts/airspy_adsb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,5 @@ sleep 10 &
"${s6wrap[@]}" "${AIRSPY_ADSB_BIN}" "${AIRSPY_ADSB_CMD[@]}" &

# trap will only work properly while the shell is running / waiting, not while another program is being foreground executed
wait || true
# the first wait exits due to the signal which is trapped, the 2nd wait actually waits for collectd to exit
wait || wait || true
Loading