diff --git a/.conf/Dockerfile.full b/.conf/Dockerfile.full index 1f7e99bcd..94f23cca4 100644 --- a/.conf/Dockerfile.full +++ b/.conf/Dockerfile.full @@ -20,4 +20,14 @@ RUN yarn build FROM nginxinc/nginx-unprivileged:alpine COPY .conf/nginx.conf /etc/nginx/conf.d/default.conf COPY --from=build-step /app/cx-portal/build /usr/share/nginx/html +# Change to root user for renaming of index.html to index.html.reference, to be used by env variables inject script +USER root +RUN mv /usr/share/nginx/html/index.html /usr/share/nginx/html/index.html.reference +# Add env variables inject script and mark as executable +COPY ./scripts/inject-dynamic-env.sh /docker-entrypoint.d/00-inject-dynamic-env.sh +RUN chmod +x /docker-entrypoint.d/00-inject-dynamic-env.sh +# Install bash for env variables inject script +RUN apk update && apk add bash +# Make nginx owner of /usr/share/nginx/html/ and change to nginx user +RUN chown -R 101:101 /usr/share/nginx/html/ USER 101 diff --git a/.conf/Dockerfile.prebuilt b/.conf/Dockerfile.prebuilt index e1f3fc3a5..e9c1c4637 100644 --- a/.conf/Dockerfile.prebuilt +++ b/.conf/Dockerfile.prebuilt @@ -10,4 +10,14 @@ FROM nginxinc/nginx-unprivileged:alpine COPY .conf/nginx.conf /etc/nginx/conf.d/default.conf COPY cx-portal/build /usr/share/nginx/html +# Change to root user for renaming of index.html to index.html.reference, to be used by env variables inject script +USER root +RUN mv /usr/share/nginx/html/index.html /usr/share/nginx/html/index.html.reference +# Add env variables inject script and mark as executable +COPY ./scripts/inject-dynamic-env.sh /docker-entrypoint.d/00-inject-dynamic-env.sh +RUN chmod +x /docker-entrypoint.d/00-inject-dynamic-env.sh +# Install bash for env variables inject script +RUN apk update && apk add bash +# Make nginx owner of /usr/share/nginx/html/ and change to nginx user +RUN chown -R 101:101 /usr/share/nginx/html/ USER 101 diff --git a/cx-portal/public/index.html b/cx-portal/public/index.html index 060fda2fa..7984e3f7b 100644 --- a/cx-portal/public/index.html +++ b/cx-portal/public/index.html @@ -28,5 +28,9 @@
+ + diff --git a/scripts/inject-dynamic-env.sh b/scripts/inject-dynamic-env.sh new file mode 100644 index 000000000..22206a9fb --- /dev/null +++ b/scripts/inject-dynamic-env.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +# Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation + +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. + +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# SPDX-License-Identifier: Apache-2.0 + +custom_env_vars='{PORTAL_FRONTEND_URL:"'$PORTAL_FRONTEND_URL'",PORTAL_BACKEND_URL:"'$PORTAL_BACKEND_URL'",CENTRALIDP_URL:"'$CENTRALIDP_URL'",BPDM_API_URL:"'$BPDM_API_URL'",SEMANTICS_URL:"'$SEMANTICS_URL'"}' +custom_env_vars_anchor='{PORTAL_FRONTEND_URL:"https://portal.dev.demo.catena-x.net",PORTAL_BACKEND_URL:"https://portal-backend.dev.demo.catena-x.net",CENTRALIDP_URL:"https://centralidp.dev.demo.catena-x.net/auth",BPDM_API_URL:"https://partners-pool.dev.demo.catena-x.net/api",SEMANTICS_URL:"https://semantics.dev.demo.catena-x.net"}' +index_html_reference=`cat /usr/share/nginx/html/index.html.reference` +index_html=${index_html_reference//$custom_env_vars_anchor/$custom_env_vars} +echo "$index_html" > /usr/share/nginx/html/index.html