trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lifecycle: also migrate before starting worker, trap exit to cleanup mode (#5123) 

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
Jens L 2023-03-30 14:04:38 +02:00 committed by GitHub
parent 75510ead84
commit 9666d407b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -102,7 +102,7 @@ COPY ./tests /tests
COPY ./manage.py / COPY ./manage.py /
COPY ./blueprints /blueprints COPY ./blueprints /blueprints
COPY ./lifecycle/ /lifecycle COPY ./lifecycle/ /lifecycle
COPY --from=go-builder /work/authentik /authentik-proxy COPY --from=go-builder /work/authentik /bin/authentik
COPY --from=web-builder /work/web/dist/ /web/dist/ COPY --from=web-builder /work/web/dist/ /web/dist/
COPY --from=web-builder /work/web/authentik/ /web/authentik/ COPY --from=web-builder /work/web/authentik/ /web/authentik/
COPY --from=website-builder /work/website/help/ /website/help/ COPY --from=website-builder /work/website/help/ /website/help/

3
Makefile
View File

@ -50,9 +50,6 @@ lint:
migrate: migrate:
python -m lifecycle.migrate python -m lifecycle.migrate
run:
go run -v ./cmd/server/
i18n-extract: i18n-extract-core web-extract i18n-extract: i18n-extract-core web-extract
i18n-extract-core: i18n-extract-core:

28
lifecycle/ak
View File

@ -1,10 +1,13 @@
#!/bin/bash -e #!/bin/bash -e
MODE_FILE="${TMPDIR}/authentik-mode"
function log { function log {
printf '{"event": "%s", "level": "info", "logger": "bootstrap"}\n' "$@" > /dev/stderr printf '{"event": "%s", "level": "info", "logger": "bootstrap"}\n' "$@" > /dev/stderr
} }
function wait_for_db { function wait_for_db {
python -m lifecycle.wait_for_db python -m lifecycle.wait_for_db
python -m lifecycle.migrate
log "Bootstrap completed" log "Bootstrap completed"
} }
@ -31,22 +34,35 @@ function check_if_root {
chown -R authentik:authentik /media /certs chown -R authentik:authentik /media /certs
chmod ug+rwx /media chmod ug+rwx /media
chmod ug+rx /certs chmod ug+rx /certs
exec chpst -u authentik:$GROUP env HOME=/authentik $1 chpst -u authentik:$GROUP env HOME=/authentik $1
} }
MODE_FILE="/tmp/authentik-mode" function set_mode {
echo $1 > $MODE_FILE
trap cleanup EXIT
}
function cleanup {
rm -f ${MODE_FILE}
}
if [[ "$1" == "server" ]]; then if [[ "$1" == "server" ]]; then
wait_for_db wait_for_db
echo "server" > $MODE_FILE set_mode "server"
python -m lifecycle.migrate # If we have bootstrap credentials set, run bootstrap tasks outside of main server
# sync, so that we can sure the first start actually has working bootstrap
# credentials
if [[ ! -z "${AUTHENTIK_BOOTSTRAP_PASSWORD}" || ! -z "${AUTHENTIK_BOOTSTRAP_TOKEN}" ]]; then if [[ ! -z "${AUTHENTIK_BOOTSTRAP_PASSWORD}" || ! -z "${AUTHENTIK_BOOTSTRAP_TOKEN}" ]]; then
python -m manage bootstrap_tasks python -m manage bootstrap_tasks
fi fi
exec /authentik-proxy if [[ -x "$(command -v authentik)" ]]; then
authentik
else
go run -v ./cmd/server/
fi
elif [[ "$1" == "worker" ]]; then elif [[ "$1" == "worker" ]]; then
wait_for_db wait_for_db
echo "worker" > $MODE_FILE set_mode "worker"
check_if_root "celery -A authentik.root.celery worker -Ofair --max-tasks-per-child=1 --autoscale 3,1 -E -B -s /tmp/celerybeat-schedule -Q authentik,authentik_scheduled,authentik_events" check_if_root "celery -A authentik.root.celery worker -Ofair --max-tasks-per-child=1 --autoscale 3,1 -E -B -s /tmp/celerybeat-schedule -Q authentik,authentik_scheduled,authentik_events"
elif [[ "$1" == "worker-status" ]]; then elif [[ "$1" == "worker-status" ]]; then
wait_for_db wait_for_db

2
website/developer-docs/setup/full-dev-environment.md
View File

@ -52,4 +52,4 @@ To format the frontend code, run `make web`.
## Running ## Running
Now that the backend and frontend have been setup and built, you can start authentik by running `make run`. authentik should now be accessible at `http://localhost:9000`. Now that the backend and frontend have been setup and built, you can start authentik by running `ak server`. authentik should now be accessible at `http://localhost:9000`.