From 6bf0722156acc98c9e3611ad4a5cd9d38a1982c5 Mon Sep 17 00:00:00 2001 From: nscuro Date: Thu, 5 Dec 2024 17:02:06 +0100 Subject: [PATCH] Add support for serving from custom path Ports https://github.com/DependencyTrack/frontend/pull/801 Co-authored-by: Martijn van der Meij Signed-off-by: nscuro # Conflicts: # docker/etc/nginx/templates/default.conf.template --- .dockerignore | 2 +- docker/Dockerfile.alpine | 7 +++-- docker/docker-compose.yml | 1 + .../default.conf.template} | 0 public/index.html | 26 ++++++++++++------- public/static/oidc-callback.html | 2 +- src/views/pages/Login.vue | 7 +++-- vue.config.js | 2 +- 8 files changed, 31 insertions(+), 16 deletions(-) rename docker/etc/nginx/{conf.d/default.conf => templates/default.conf.template} (100%) diff --git a/.dockerignore b/.dockerignore index 8b986a57..4d6915f3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -10,5 +10,5 @@ docs/ node_modules/ release.sh snapshot.sh -!docker/etc/nginx/conf.d/default.conf +!docker/etc/nginx/templates/default.conf.template !docker/docker-entrypoint.d/*.sh diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 3884a7f4..49d80824 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -9,7 +9,8 @@ ENV TZ=Etc/UTC \ LANG=C.UTF-8 \ # Set default settings that may get overridden to empty values by # the entrypoint script, if not explicitly provided by the user - OIDC_SCOPE="openid profile email" + OIDC_SCOPE="openid profile email" \ + BASE_PATH="/" USER root @@ -29,8 +30,10 @@ RUN chown -R 101:0 ${APP_DIR} \ # See https://github.com/nginxinc/docker-nginx-unprivileged/blob/main/stable/alpine/Dockerfile#L139 USER 101 +RUN mkdir /etc/nginx/templates + # Setup entrypoint -COPY --chown=101:0 ./docker/etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf +COPY --chown=101:0 ./docker/etc/nginx/templates/default.conf.template /etc/nginx/templates/default.conf.template COPY --chmod=755 ./docker/docker-entrypoint.d/ /docker-entrypoint.d/ # Specify the container working directory diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 44b403c2..23014d29 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -18,6 +18,7 @@ services: - dtrack-apiserver environment: - "API_BASE_URL=http://localhost:8081" + # - "BASE_PATH=" # - "OIDC_ISSUER=" # - "OIDC_CLIENT_ID=" # - "OIDC_SCOPE=" diff --git a/docker/etc/nginx/conf.d/default.conf b/docker/etc/nginx/templates/default.conf.template similarity index 100% rename from docker/etc/nginx/conf.d/default.conf rename to docker/etc/nginx/templates/default.conf.template diff --git a/public/index.html b/public/index.html index 34c0c0d7..6a576e19 100644 --- a/public/index.html +++ b/public/index.html @@ -1,30 +1,38 @@ - + - - - + + + Dependency-Track +