make things work

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
Jens Langhammer 2023-05-06 18:15:03 +02:00
parent 7a41137278
commit 811d50f84b
No known key found for this signature in database
5 changed files with 22 additions and 15 deletions

View File

@ -2,4 +2,6 @@ FROM ghcr.io/goauthentik/server:latest
USER root USER root
RUN pip install --no-cache-dir -r /requirements-dev.txt HEALTHCHECK --interval=10s CMD exit 0
RUN pip install --no-cache-dir -r /app-root/requirements-dev.txt

View File

@ -2,7 +2,7 @@
"name": "authentik", "name": "authentik",
"dockerComposeFile": "docker-compose.yml", "dockerComposeFile": "docker-compose.yml",
"service": "app", "service": "app",
"workspaceFolder": "/authentik", "workspaceFolder": "/app-root",
"features": { "features": {
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}, "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
"ghcr.io/devcontainers/features/go:1": {}, "ghcr.io/devcontainers/features/go:1": {},

View File

@ -6,8 +6,13 @@ services:
context: .. context: ..
dockerfile: .devcontainer/Dockerfile dockerfile: .devcontainer/Dockerfile
volumes: volumes:
- ../:/authentik:cached - ../:/app-root:cached
command: debug command: debug
environment:
AUTHENTIK_POSTGRESQL__USER: postgres
AUTHENTIK_POSTGRESQL__PASSWORD: postgres
AUTHENTIK_BOOTSTRAP_PASSWORD: akadmin
AUTHENTIK_BOOTSTRAP_TOKEN: akadmin
db: db:
image: docker.io/library/postgres:15 image: docker.io/library/postgres:15
restart: unless-stopped restart: unless-stopped
@ -16,7 +21,7 @@ services:
network_mode: service:app network_mode: service:app
environment: environment:
POSTGRES_USER: postgres POSTGRES_USER: postgres
POSTGRES_DB: postgres POSTGRES_DB: authentik
POSTGRES_PASSWORD: postgres POSTGRES_PASSWORD: postgres
redis: redis:
image: docker.io/redis/redis-stack-server image: docker.io/redis/redis-stack-server

18
.vscode/tasks.json vendored
View File

@ -3,26 +3,23 @@
"tasks": [ "tasks": [
{ {
"label": "authentik[core]: format & test", "label": "authentik[core]: format & test",
"command": "poetry", "command": "make",
"args": [
"run",
"make"
],
"group": "build", "group": "build",
}, },
{ {
"label": "authentik[core]: run", "label": "authentik[core]: run",
"command": "poetry", "command": "ak",
"args": [ "args": [
"run", "server",
"make",
"run",
], ],
"group": "build", "group": "build",
"presentation": { "presentation": {
"panel": "dedicated", "panel": "dedicated",
"group": "running" "group": "running"
}, },
"runOptions": {
"runOn": "folderOpen"
}
}, },
{ {
"label": "authentik[web]: format", "label": "authentik[web]: format",
@ -39,6 +36,9 @@
"panel": "dedicated", "panel": "dedicated",
"group": "running" "group": "running"
}, },
"runOptions": {
"runOn": "folderOpen"
}
}, },
{ {
"label": "authentik: install", "label": "authentik: install",

View File

@ -84,7 +84,7 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends libxmlsec1-openssl libmaxminddb0 && \ apt-get install -y --no-install-recommends libxmlsec1-openssl libmaxminddb0 && \
# Required for bootstrap & healtcheck # Required for bootstrap & healtcheck
apt-get install -y --no-install-recommends runit && \ apt-get install -y --no-install-recommends runit && \
pip install --no-cache-dir -r /requirements.txt && \ pip install --no-cache-dir -r /app-root/requirements.txt && \
apt-get remove --purge -y build-essential pkg-config libxmlsec1-dev && \ apt-get remove --purge -y build-essential pkg-config libxmlsec1-dev && \
apt-get autoremove --purge -y && \ apt-get autoremove --purge -y && \
apt-get clean && \ apt-get clean && \
@ -111,7 +111,7 @@ USER 1000
ENV TMPDIR /dev/shm/ ENV TMPDIR /dev/shm/
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
ENV PATH "/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/lifecycle" ENV PATH "/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/app-root/lifecycle"
HEALTHCHECK --interval=30s --timeout=30s --start-period=60s --retries=3 CMD [ "ak", "healthcheck" ] HEALTHCHECK --interval=30s --timeout=30s --start-period=60s --retries=3 CMD [ "ak", "healthcheck" ]