From a06189e9c03e8dd22b60966490d5fcb159847bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Jer=C3=B3nimo?= Date: Tue, 16 Jan 2024 18:39:20 +0000 Subject: [PATCH 1/5] Added entrypoint script to dynamically change Nginx configuration based on environment variables --- docker/Dockerfile-frontend | 3 ++- docker/entrypoint-frontend.sh | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 docker/entrypoint-frontend.sh diff --git a/docker/Dockerfile-frontend b/docker/Dockerfile-frontend index 6235770..35df795 100644 --- a/docker/Dockerfile-frontend +++ b/docker/Dockerfile-frontend @@ -2,4 +2,5 @@ FROM docker.io/nginx:stable-alpine COPY --chown=nginx:nginx frontend/dist/apps/web/ /var/www/abrechnung/ COPY --chown=nginx:nginx frontend/apps/web/src/assets/config.json /var/www/abrechnung/config.json -COPY docker/nginx-static /etc/nginx/conf.d/default.conf \ No newline at end of file +COPY docker/nginx-static /etc/nginx/conf.d/default.conf +COPY docker/entrypoint-frontend.sh /docker-entrypoint.d/99-abrechnung.sh diff --git a/docker/entrypoint-frontend.sh b/docker/entrypoint-frontend.sh new file mode 100644 index 0000000..c9abbc8 --- /dev/null +++ b/docker/entrypoint-frontend.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +CONF="/etc/nginx/conf.d/default.conf" + +[[ ! -z "${ABRECHNUNG_API__HOST}" ]] && sed -i "s/api:/${ABRECHNUNG_API__HOST}:/g" "$CONF" +[[ ! -z "${ABRECHNUNG_API__PORT}" ]] && sed -i "s/:8080/:${ABRECHNUNG_API__PORT}/g" "$CONF" From e3aaf3064b61713f6623d0828aa95e2fb3927165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Jer=C3=B3nimo?= Date: Tue, 16 Jan 2024 18:59:25 +0000 Subject: [PATCH 2/5] Nginx configuration now downgrades to IPv4 only if IPv6 is disabled --- docker/Dockerfile-frontend | 2 +- docker/entrypoint-frontend.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile-frontend b/docker/Dockerfile-frontend index 35df795..7c2ce10 100644 --- a/docker/Dockerfile-frontend +++ b/docker/Dockerfile-frontend @@ -3,4 +3,4 @@ FROM docker.io/nginx:stable-alpine COPY --chown=nginx:nginx frontend/dist/apps/web/ /var/www/abrechnung/ COPY --chown=nginx:nginx frontend/apps/web/src/assets/config.json /var/www/abrechnung/config.json COPY docker/nginx-static /etc/nginx/conf.d/default.conf -COPY docker/entrypoint-frontend.sh /docker-entrypoint.d/99-abrechnung.sh +COPY --chown=nginx:nginx --chmod=0750 docker/entrypoint-frontend.sh /docker-entrypoint.d/99-abrechnung.sh diff --git a/docker/entrypoint-frontend.sh b/docker/entrypoint-frontend.sh index c9abbc8..1b2993f 100644 --- a/docker/entrypoint-frontend.sh +++ b/docker/entrypoint-frontend.sh @@ -4,3 +4,4 @@ CONF="/etc/nginx/conf.d/default.conf" [[ ! -z "${ABRECHNUNG_API__HOST}" ]] && sed -i "s/api:/${ABRECHNUNG_API__HOST}:/g" "$CONF" [[ ! -z "${ABRECHNUNG_API__PORT}" ]] && sed -i "s/:8080/:${ABRECHNUNG_API__PORT}/g" "$CONF" +[[ ! -f "/proc/net/if_inet6" ]] && sed -i "s/listen \[::\]/#listen \[::\]/g" "$CONF" From e141ff8449cba06b52b604d0009af86cef217e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Jer=C3=B3nimo?= Date: Tue, 16 Jan 2024 19:40:24 +0000 Subject: [PATCH 3/5] Changed Dockerfile-frontend to reflect new directory tree --- docker/Dockerfile-frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-frontend b/docker/Dockerfile-frontend index 7c2ce10..241ffab 100644 --- a/docker/Dockerfile-frontend +++ b/docker/Dockerfile-frontend @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3 FROM docker.io/nginx:stable-alpine -COPY --chown=nginx:nginx frontend/dist/apps/web/ /var/www/abrechnung/ +COPY --chown=nginx:nginx frontend/apps/web/ /var/www/abrechnung/ COPY --chown=nginx:nginx frontend/apps/web/src/assets/config.json /var/www/abrechnung/config.json COPY docker/nginx-static /etc/nginx/conf.d/default.conf COPY --chown=nginx:nginx --chmod=0750 docker/entrypoint-frontend.sh /docker-entrypoint.d/99-abrechnung.sh From 569387da91ff3457820da0805301b811bd13e734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Jer=C3=B3nimo?= Date: Tue, 16 Jan 2024 20:00:35 +0000 Subject: [PATCH 4/5] Removed unecessary file ownership --- docker/Dockerfile-frontend | 2 +- docker/entrypoint-frontend.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile-frontend b/docker/Dockerfile-frontend index 241ffab..75b312d 100644 --- a/docker/Dockerfile-frontend +++ b/docker/Dockerfile-frontend @@ -3,4 +3,4 @@ FROM docker.io/nginx:stable-alpine COPY --chown=nginx:nginx frontend/apps/web/ /var/www/abrechnung/ COPY --chown=nginx:nginx frontend/apps/web/src/assets/config.json /var/www/abrechnung/config.json COPY docker/nginx-static /etc/nginx/conf.d/default.conf -COPY --chown=nginx:nginx --chmod=0750 docker/entrypoint-frontend.sh /docker-entrypoint.d/99-abrechnung.sh +COPY --chmod=0755 docker/entrypoint-frontend.sh /docker-entrypoint.d/99-abrechnung.sh diff --git a/docker/entrypoint-frontend.sh b/docker/entrypoint-frontend.sh index 1b2993f..c37563f 100644 --- a/docker/entrypoint-frontend.sh +++ b/docker/entrypoint-frontend.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh CONF="/etc/nginx/conf.d/default.conf" From 6eb488952ab160f49d2bd7342805addb92e79caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Jer=C3=B3nimo?= Date: Tue, 16 Jan 2024 20:24:54 +0000 Subject: [PATCH 5/5] Rolled back changes made in e141ff8 --- docker/Dockerfile-frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-frontend b/docker/Dockerfile-frontend index 75b312d..749fe9f 100644 --- a/docker/Dockerfile-frontend +++ b/docker/Dockerfile-frontend @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3 FROM docker.io/nginx:stable-alpine -COPY --chown=nginx:nginx frontend/apps/web/ /var/www/abrechnung/ +COPY --chown=nginx:nginx frontend/dist/apps/web/ /var/www/abrechnung/ COPY --chown=nginx:nginx frontend/apps/web/src/assets/config.json /var/www/abrechnung/config.json COPY docker/nginx-static /etc/nginx/conf.d/default.conf COPY --chmod=0755 docker/entrypoint-frontend.sh /docker-entrypoint.d/99-abrechnung.sh