add missing PROVIDER env variable for docker (#2404)

* add missing PROVIDER env variable for docker

* fix docker env propagation

* fix code

* update docker vars
This commit is contained in:
Denys Vuika 2022-01-18 11:10:25 +00:00 committed by GitHub
parent 37acccd6d6
commit c3de2da2ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 0 deletions

View File

@ -17,6 +17,22 @@ RUN apk update && apk upgrade
USER 101 USER 101
ARG PROJECT_NAME ARG PROJECT_NAME
ARG PROVIDER="ECM"
ARG AUTH_TYPE="BASIC"
ENV APP_CONFIG_PROVIDER=$PROVIDER
ENV APP_CONFIG_AUTH_TYPE=$AUTH_TYPE
ENV APP_CONFIG_OAUTH2_HOST="{protocol}//{hostname}{:port}/auth/realms/alfresco"
ENV APP_CONFIG_BPM_HOST="{protocol}//{hostname}{:port}"
ENV APP_CONFIG_ECM_HOST="{protocol}//{hostname}{:port}"
ENV APP_CONFIG_OAUTH2_CLIENTID="alfresco"
ENV APP_CONFIG_OAUTH2_IMPLICIT_FLOW=true
ENV APP_CONFIG_OAUTH2_SILENT_LOGIN=true
ENV APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI="{protocol}//{hostname}{:port}/assets/silent-refresh.html"
ENV APP_CONFIG_OAUTH2_REDIRECT_LOGIN="/"
ENV APP_CONFIG_OAUTH2_REDIRECT_LOGOUT="/"
COPY docker/default.conf.template /etc/nginx/templates/ COPY docker/default.conf.template /etc/nginx/templates/
COPY docker/docker-entrypoint.d/* /docker-entrypoint.d/ COPY docker/docker-entrypoint.d/* /docker-entrypoint.d/

View File

@ -10,6 +10,12 @@ echo "replace APP_CONFIG_AUTH_TYPE"
-i "${NGINX_ENVSUBST_OUTPUT_DIR}/app.config.json" -i "${NGINX_ENVSUBST_OUTPUT_DIR}/app.config.json"
fi fi
if [ -n "${APP_CONFIG_PROVIDER}"]; then
echo "replace APP_CONFIG_PROVIDER"
sed -e "s/\"providers\": \".*\"/\"providers\": \"${APP_CONFIG_PROVIDER}\"/g" \
-i "${NGINX_ENVSUBST_OUTPUT_DIR}/app.config.json"
fi
if [ -n "${APP_CONFIG_IDENTITY_HOST}" ]; then if [ -n "${APP_CONFIG_IDENTITY_HOST}" ]; then
echo "replace APP_CONFIG_IDENTITY_HOST" echo "replace APP_CONFIG_IDENTITY_HOST"
replace="\/" replace="\/"

View File

@ -8,6 +8,7 @@ docker rmi -f $DOCKER_IMAGE_REPO
docker build --build-arg PROJECT_NAME=$PROJECT_NAME -t $DOCKER_IMAGE_REPO . docker build --build-arg PROJECT_NAME=$PROJECT_NAME -t $DOCKER_IMAGE_REPO .
echo "http://localhost:${HOST_PORT}${BASE_PATH}" echo "http://localhost:${HOST_PORT}${BASE_PATH}"
docker run --rm -it \ docker run --rm -it \
--env APP_CONFIG_PROVIDER=$APP_CONFIG_PROVIDER \
--env BASE_PATH=$BASE_PATH \ --env BASE_PATH=$BASE_PATH \
--env APP_CONFIG_AUTH_TYPE=$APP_CONFIG_AUTH_TYPE \ --env APP_CONFIG_AUTH_TYPE=$APP_CONFIG_AUTH_TYPE \
--env APP_CONFIG_IDENTITY_HOST=$APP_CONFIG_IDENTITY_HOST \ --env APP_CONFIG_IDENTITY_HOST=$APP_CONFIG_IDENTITY_HOST \