From 7489d19e413e02b27a8b0db2c9f59e685a11d2b8 Mon Sep 17 00:00:00 2001 From: Philip Henning Date: Tue, 19 Nov 2024 15:51:38 +0100 Subject: [PATCH] change back from service to regular docker compose --- README.md | 28 ++++------------------------ scripts/init.sh | 18 ------------------ 2 files changed, 4 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 746888f..869c1d9 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,6 @@ apt update \ tee /etc/apt/sources.list.d/docker.list > /dev/null \ && apt update \ && apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \ - && echo "{" > /etc/docker/daemon.json \ - && echo " \"log-driver\": \"journald\"" >> /etc/docker/daemon.json \ - && echo "}" >> /etc/docker/daemon.json \ - && systemctl restart docker.service \ && mkdir -p /var/lib/apps \ && ln -s /var/lib/apps \ && apt install -y git vim \ @@ -43,32 +39,16 @@ cd /root/apps \ && ./scripts/init.sh \ && docker compose build --no-cache \ --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ - --build-arg SRC_REV=$(git rev-parse --short HEAD) -``` - -## Service Handling - -Start service: -```shell -systemctl start authentik.service -``` - -Stop service: -```shell -systemctl stop authentik.service -``` - -Show logs: -```shell -journalctl -xef -u authentik.service + --build-arg SRC_REV=$(git rev-parse --short HEAD) \ + && docker compose up -d; docker compose logs -f ``` ## Upgrade 1. Update `AUTHENTIK_TAG` to the desired tag in `env.template`, as well as in the deployed `.env` file. -2. `systemctl stop authentik.service` -3. `systemctl start authentik.service; journalctl -xef -u authentik.service` +2. `docker compose down` +3. `docker compose up -d; docker compose logs -f` ## Rebuild containers locally diff --git a/scripts/init.sh b/scripts/init.sh index 626eb80..a895189 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -95,21 +95,3 @@ Persistent=true [Install] WantedBy=timers.target EOF - -# Setup systemd service for authentik -[[ ! -f /etc/systemd/system/authentik.service ]] && cat < /etc/systemd/system/authentik.service && systemctl daemon-reload && systemctl enable authentik.service -[Unit] -Description=Authentik Docker Compose Service -After=network.target docker.service -Requires=docker.service - -[Service] -Restart=always -WorkingDirectory=${AUTHENTIK_DOCKER_COMPOSE_PATH} -ExecStart=/usr/bin/docker compose up -d -ExecStop=/usr/bin/docker compose down -TimeoutStartSec=0 - -[Install] -WantedBy=multi-user.target -EOF