From 4df2fb139131e0dd5bb6fc1543d59c39789c6567 Mon Sep 17 00:00:00 2001 From: mo8it Date: Tue, 2 Jan 2024 15:38:55 +0100 Subject: [PATCH] Reorder sections --- containers/forgejo.container | 8 ++++---- containers/hedgedoc.container | 8 ++++---- containers/juna-li-com.fish | 10 ++++++++++ containers/mo8it-com.fish | 10 ++++++++++ containers/nextcloud.container | 8 ++++---- containers/oxitraffic-corrode-dev.container | 8 ++++---- containers/oxitraffic.container | 8 ++++---- containers/yinghong-massage.fish | 10 ++++++++++ 8 files changed, 50 insertions(+), 20 deletions(-) diff --git a/containers/forgejo.container b/containers/forgejo.container index 98e6568..20196dc 100644 --- a/containers/forgejo.container +++ b/containers/forgejo.container @@ -1,7 +1,3 @@ -[Unit] -Requires=lldap.service -After=lldap.service - [Container] Image=codeberg.org/forgejo/forgejo:1.21 AutoUpdate=registry @@ -9,6 +5,10 @@ Network=traefik.network PublishPort=2222:2222 Volume=%h/volumes/forgejo/data:/data:Z +[Unit] +Requires=lldap.service +After=lldap.service + [Service] Restart=always diff --git a/containers/hedgedoc.container b/containers/hedgedoc.container index f8e2618..c7ba350 100644 --- a/containers/hedgedoc.container +++ b/containers/hedgedoc.container @@ -1,7 +1,3 @@ -[Unit] -Requires=hedgedoc-db.service -After=hedgedoc-db.service - [Container] Image=quay.io/hedgedoc/hedgedoc:latest AutoUpdate=registry @@ -25,6 +21,10 @@ Environment=CMD_ALLOW_ANONYMOUS_EDITS=true Environment=CMD_DEFAULT_PERMISSION=freely Environment=CMD_DOMAIN=pads.mo8it.com +[Unit] +Requires=hedgedoc-db.service +After=hedgedoc-db.service + [Service] Restart=always diff --git a/containers/juna-li-com.fish b/containers/juna-li-com.fish index 3abb32e..16a7cbf 100755 --- a/containers/juna-li-com.fish +++ b/containers/juna-li-com.fish @@ -6,7 +6,17 @@ mkdir -p ~/volumes/$container_name podman run \ --rm \ + --pull newer \ + -v ~/code/juna-li.com:/volumes/src:Z \ + -w /volumes/src \ + docker.io/library/node:slim bash -c "npm add tailwindcss && npx tailwindcss -m -i input.css -o static/main.css" + +podman run \ + --rm \ + --pull newer \ -v ~/code/juna-li.com:/volumes/src:Z,ro \ -v ~/volumes/$container_name:/volumes/output:Z \ -w /volumes/src \ ghcr.io/getzola/zola:v0.18.0 build -o /volumes/output/public -f + +systemctl --user restart juna-li-com diff --git a/containers/mo8it-com.fish b/containers/mo8it-com.fish index 3388d6b..82e21ef 100755 --- a/containers/mo8it-com.fish +++ b/containers/mo8it-com.fish @@ -6,7 +6,17 @@ mkdir -p ~/volumes/$container_name podman run \ --rm \ + --pull newer \ + -v ~/code/mo8it.com:/volumes/src:Z \ + -w /volumes/src \ + docker.io/library/node:slim bash -c "npm add tailwindcss && npx tailwindcss -m -i input.css -o static/main.css" + +podman run \ + --rm \ + --pull newer \ -v ~/code/mo8it.com:/volumes/src:Z,ro \ -v ~/volumes/$container_name:/volumes/output:Z \ -w /volumes/src \ ghcr.io/getzola/zola:v0.18.0 build -o /volumes/output/public -f + +systemctl --user restart mo8it-com diff --git a/containers/nextcloud.container b/containers/nextcloud.container index d99c005..2e39a7c 100644 --- a/containers/nextcloud.container +++ b/containers/nextcloud.container @@ -1,7 +1,3 @@ -[Unit] -Requires=nextcloud-db.service lldap.service -After=nextcloud-db.service lldap.service - [Container] Image=docker.io/library/nextcloud:28-apache AutoUpdate=registry @@ -11,6 +7,10 @@ Volume=%h/volumes/nextcloud/nextcloud:/var/www/html:Z EnvironmentFile=%h/volumes/nextcloud/.postgres.env Environment=POSTGRES_HOST=systemd-nextcloud-db +[Unit] +Requires=nextcloud-db.service lldap.service +After=nextcloud-db.service lldap.service + [Service] Restart=always diff --git a/containers/oxitraffic-corrode-dev.container b/containers/oxitraffic-corrode-dev.container index 7d20d1c..a1a62c7 100644 --- a/containers/oxitraffic-corrode-dev.container +++ b/containers/oxitraffic-corrode-dev.container @@ -1,7 +1,3 @@ -[Unit] -Requires=oxitraffic-corrode-dev-db.service -After=oxitraffic-corrode-dev-db.service - [Container] Image=docker.io/mo8it/oxitraffic:latest AutoUpdate=registry @@ -9,6 +5,10 @@ Network=traefik.network Volume=%h/volumes/oxitraffic-corrode-dev/config.toml:/volumes/config.toml:Z,ro Volume=%h/volumes/oxitraffic-corrode-dev/logs:/var/log/oxitraffic:Z +[Unit] +Requires=oxitraffic-corrode-dev-db.service +After=oxitraffic-corrode-dev-db.service + [Service] Restart=always diff --git a/containers/oxitraffic.container b/containers/oxitraffic.container index e85dbd6..ee3dc85 100644 --- a/containers/oxitraffic.container +++ b/containers/oxitraffic.container @@ -1,7 +1,3 @@ -[Unit] -Requires=oxitraffic-db.service -After=oxitraffic-db.service - [Container] Image=docker.io/mo8it/oxitraffic:latest AutoUpdate=registry @@ -9,6 +5,10 @@ Network=traefik.network Volume=%h/volumes/oxitraffic/config.toml:/volumes/config.toml:Z,ro Volume=%h/volumes/oxitraffic/logs:/var/log/oxitraffic:Z +[Unit] +Requires=oxitraffic-db.service +After=oxitraffic-db.service + [Service] Restart=always diff --git a/containers/yinghong-massage.fish b/containers/yinghong-massage.fish index 901c570..9011f2f 100755 --- a/containers/yinghong-massage.fish +++ b/containers/yinghong-massage.fish @@ -6,7 +6,17 @@ mkdir -p ~/volumes/$container_name podman run \ --rm \ + --pull newer \ + -v ~/code/yinghong-massage.de:/volumes/src:Z \ + -w /volumes/src \ + docker.io/library/node:slim bash -c "npm add tailwindcss && npx tailwindcss -m -i input.css -o static/main.css" + +podman run \ + --rm \ + --pull newer \ -v ~/code/yinghong-massage.de:/volumes/src:Z,ro \ -v ~/volumes/$container_name:/volumes/output:Z \ -w /volumes/src \ ghcr.io/getzola/zola:v0.18.0 build -o /volumes/output/public -f + +systemctl --user restart yinghong-massage