From 987c8ccba5ff54a43b2a09cb6d7cb2a260ffeac8 Mon Sep 17 00:00:00 2001 From: Armin Friedl Date: Wed, 29 Jul 2020 00:34:28 +0200 Subject: [PATCH] Read configuration from environment --- container/Dockerfile | 9 +++++++-- container/entrypoint.sh | 2 ++ container/var/www/fling/config.js.template | 5 +++++ web/fling/public/config.js | 5 +++++ web/fling/public/index.html | 1 + web/fling/src/components/admin/FlingArtifacts.jsx | 2 +- web/fling/src/components/admin/Upload.jsx | 4 ++-- web/fling/src/components/user/DirectDownload.jsx | 4 ++-- web/fling/src/components/user/FlingUserList.jsx | 6 +++--- web/fling/src/index.js | 4 ++-- web/fling/src/util/fc.js | 2 +- 11 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 container/var/www/fling/config.js.template create mode 100644 web/fling/public/config.js diff --git a/container/Dockerfile b/container/Dockerfile index 08d47a2..2b5f69a 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -2,7 +2,11 @@ FROM alpine:latest ARG VERSION -RUN apk add --update --no-cache nginx openjdk11-jre && \ +ENV FLING_API_BASE http://localhost:3000 +ENV FLING_LOG_LEVEL warn +ENV FLING_FILESIZE 209715200 + +RUN apk add --update --no-cache nginx openjdk11-jre gettext && \ mkdir -p /var/fling/files && \ mkdir -p /tmp/fling && \ wget -O /tmp/fling/service.jar "https://nexus.friedl.net/service/rest/v1/search/assets/download?sort=version&maven.groupId=net.friedl&maven.artifactId=fling&maven.baseVersion=$(echo -n $VERSION | tr [:lower:] [:upper:])&maven.extension=jar" && \ @@ -14,7 +18,8 @@ RUN apk add --update --no-cache nginx openjdk11-jre && \ mv /tmp/fling/service.jar ./service.jar COPY ./etc/nginx/conf.d /etc/nginx/conf.d -COPY ./entrypoint.sh ./usr/local/bin/entrypoint.sh +COPY ./var/www/fling/config.js.template /var/www/fling/config.js.template +COPY ./entrypoint.sh /usr/local/bin/entrypoint.sh VOLUME /var/fling/ diff --git a/container/entrypoint.sh b/container/entrypoint.sh index 296a77a..bfad7ce 100755 --- a/container/entrypoint.sh +++ b/container/entrypoint.sh @@ -6,4 +6,6 @@ mkdir /var/run/nginx # nginx fails with /var/run/nginx/nginx.pid not found in al nginx +cat /var/www/fling/config.js.template | envsubst > /var/www/fling/config.js + java ${FL_JVM_OPTS} -jar service.jar diff --git a/container/var/www/fling/config.js.template b/container/var/www/fling/config.js.template new file mode 100644 index 0000000..adce724 --- /dev/null +++ b/container/var/www/fling/config.js.template @@ -0,0 +1,5 @@ +window['flingconfig'] = { + API_BASE: "${FLING_API_BASE}", + LOG_LEVEL: "${FLING_LOG_LEVEL}", + FILESIZE: "${FLING_FILESIZE}" +} diff --git a/web/fling/public/config.js b/web/fling/public/config.js new file mode 100644 index 0000000..5ed728b --- /dev/null +++ b/web/fling/public/config.js @@ -0,0 +1,5 @@ +window['flingconfig'] = { + API_BASE: "http://localhost:8080", + LOG_LEVEL: "warn", + FILESIZE: 209715200 +} diff --git a/web/fling/public/index.html b/web/fling/public/index.html index 5d62148..6b7d1da 100644 --- a/web/fling/public/index.html +++ b/web/fling/public/index.html @@ -4,6 +4,7 @@ +