Changes needed to support SSO for admin access on Demos (#15436)

* Ensure the release build passes through the env var to bootstrap Demo SSO users if needed

* More triggering work on the Dockerfile

* Add way to stop downloading the DB via the file clock
This commit is contained in:
Steve Jalim 2024-11-04 19:06:11 +00:00 коммит произвёл GitHub
Родитель c3ed5d2bb8
Коммит 980e12616a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
3 изменённых файлов: 10 добавлений и 1 удалений

Просмотреть файл

@ -128,6 +128,9 @@ ENV GIT_SHA=${GIT_SHA}
#
FROM app-base AS release
ARG DEMO_SERVER_ADMIN_USERS
ENV DEMO_SERVER_ADMIN_USERS=${DEMO_SERVER_ADMIN_USERS}
RUN bin/run-sync-all.sh
COPY --from=assets /app/assets /app/assets

Просмотреть файл

@ -4,7 +4,12 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
bin/run-db-download.py --force
# On demos, we don't want to download the latest DB, else we'll lose CMS data
SKIP_FORCED_DB_DOWNLOAD=$(echo "${SKIP_FORCED_DB_DOWNLOAD:-false}" | tr '[:upper:]' '[:lower:]')
if [[ "$SKIP_FORCED_DB_DOWNLOAD" == "false" ]]; then
bin/run-db-download.py --force
fi
LOCAL_DB_UPDATE=$(echo "${LOCAL_DB_UPDATE:-false}" | tr '[:upper:]' '[:lower:]')
if [[ "$LOCAL_DB_UPDATE" == "true" ]]; then
python manage.py migrate --noinput

Просмотреть файл

@ -23,3 +23,4 @@ SECURE_SSL_REDIRECT: "True"
SENTRY_DSN: https://97ec0cd426714b728e92f3b3aa62f00b@o1069899.ingest.sentry.io/6260338
SWITCH_NEWSLETTER_MAINTENANCE_MODE: "False"
WAGTAIL_ENABLE_ADMIN: "True"
SKIP_FORCED_DB_DOWNLOAD: "True"