chore: replace docker-compose with docker compose in service files

chore: replace gitea with forgejo
2024-12-25 22:23:00 +01:00 · 2024-12-25 22:21:11 +01:00
13 changed files with 50 additions and 47 deletions
--- a/etc/systemd/system/dns-proxy-dc.service
+++ b/etc/systemd/system/dns-proxy-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/dns-proxy
-ExecStart=/usr/bin/docker-compose --project-name dns-proxy up
-ExecStop=/usr/bin/docker-compose --project-name dns-proxy down
+ExecStart=/usr/bin/docker compose --project-name dns-proxy up
+ExecStop=/usr/bin/docker compose --project-name dns-proxy down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitIntervalSec=60
--- a/etc/systemd/system/forgejo-dc.service
+++ b/etc/systemd/system/forgejo-dc.service
@ -0,0 +1,15 @@
+[Unit]
+Description=Forgejo (Compose Service)
+Requires=docker.service
+After=docker.service
+
+[Service]
+WorkingDirectory=/opt/forgejo
+ExecStart=/usr/bin/docker compose --project-name forgejo up
+ExecStop=/usr/bin/docker compose --project-name forgejo down
+TimeoutStartSec=0
+Restart=on-failure
+StartLimitBurst=3
+
+[Install]
+WantedBy=multi-user.target
--- a/etc/systemd/system/gitea-dc.service
+++ b/etc/systemd/system/gitea-dc.service
@ -1,15 +0,0 @@
-[Unit]
-Description=Gitea (Compose Service)
-Requires=docker.service
-After=docker.service
-
-[Service]
-WorkingDirectory=/opt/gitea
-ExecStart=/usr/bin/docker-compose --project-name gitea up
-ExecStop=/usr/bin/docker-compose --project-name gitea down
-TimeoutStartSec=0
-Restart=on-failure
-StartLimitBurst=3
-
-[Install]
-WantedBy=multi-user.target
--- a/etc/systemd/system/kanboard-dc.service
+++ b/etc/systemd/system/kanboard-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/kanboard
-ExecStart=/usr/bin/docker-compose --project-name kanboard up
-ExecStop=/usr/bin/docker-compose --project-name kanboard down
+ExecStart=/usr/bin/docker compose --project-name kanboard up
+ExecStop=/usr/bin/docker compose --project-name kanboard down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitBurst=3
--- a/etc/systemd/system/mailu-dc.service
+++ b/etc/systemd/system/mailu-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/mailu
-ExecStart=/usr/bin/docker-compose --project-name mailu up
-ExecStop=/usr/bin/docker-compose --project-name mailu down
+ExecStart=/usr/bin/docker compose --project-name mailu up
+ExecStop=/usr/bin/docker compose --project-name mailu down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitBurst=3
--- a/etc/systemd/system/mpa-wp-dc.service
+++ b/etc/systemd/system/mpa-wp-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/mpa_wordpress
-ExecStart=/usr/bin/docker-compose --project-name mpa-wp up
-ExecStop=/usr/bin/docker-compose --project-name mpa-wp down
+ExecStart=/usr/bin/docker compose --project-name mpa-wp up
+ExecStop=/usr/bin/docker compose --project-name mpa-wp down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitBurst=3
--- a/etc/systemd/system/mumble-dc.service
+++ b/etc/systemd/system/mumble-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/mumble
-ExecStart=/usr/bin/docker-compose --project-name mumble up
-ExecStop=/usr/bin/docker-compose --project-name mumble down
+ExecStart=/usr/bin/docker compose --project-name mumble up
+ExecStop=/usr/bin/docker compose --project-name mumble down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitBurst=3
--- a/etc/systemd/system/openldap-dc.service
+++ b/etc/systemd/system/openldap-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/openldap
-ExecStart=/usr/bin/docker-compose --project-name openldap up
-ExecStop=/usr/bin/docker-compose --project-name openldap down
+ExecStart=/usr/bin/docker compose --project-name openldap up
+ExecStop=/usr/bin/docker compose --project-name openldap down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitBurst=3
--- a/etc/systemd/system/syncthing-dc.service
+++ b/etc/systemd/system/syncthing-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/syncthing
-ExecStart=/usr/bin/docker-compose --project-name syncthing up
-ExecStop=/usr/bin/docker-compose --project-name syncthing down
+ExecStart=/usr/bin/docker compose --project-name syncthing up
+ExecStop=/usr/bin/docker compose --project-name syncthing down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitBurst=3
--- a/etc/systemd/system/vaultwarden-dc.service
+++ b/etc/systemd/system/vaultwarden-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/vaultwarden
-ExecStart=/usr/bin/docker-compose --project-name vaultwarden up
-ExecStop=/usr/bin/docker-compose --project-name vaultwarden down
+ExecStart=/usr/bin/docker compose --project-name vaultwarden up
+ExecStop=/usr/bin/docker compose --project-name vaultwarden down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitBurst=3
--- a/etc/systemd/system/website-dc.service
+++ b/etc/systemd/system/website-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/website
-ExecStart=/usr/bin/docker-compose --project-name website up
-ExecStop=/usr/bin/docker-compose --project-name website down
+ExecStart=/usr/bin/docker compose --project-name website up
+ExecStop=/usr/bin/docker compose --project-name website down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitBurst=3
--- a/etc/systemd/system/yopass-dc.service
+++ b/etc/systemd/system/yopass-dc.service
@ -5,8 +5,8 @@ After=docker.service

 [Service]
 WorkingDirectory=/opt/yopass
-ExecStart=/usr/bin/docker-compose --project-name yopass up
-ExecStop=/usr/bin/docker-compose --project-name yopass down
+ExecStart=/usr/bin/docker compose --project-name yopass up
+ExecStop=/usr/bin/docker compose --project-name yopass down
 TimeoutStartSec=0
 Restart=on-failure
 StartLimitBurst=3
--- a/opt/forgejo/docker-compose.yml
+++ b/opt/forgejo/docker-compose.yml
@ -1,16 +1,17 @@
-version: "3.0"
-
+---
 networks:
-  gitea:
+  forgejo:
    external: false

 services:
  server:
-    image: gitea/gitea:1.21.5
+    image: codeberg.org/forgejo/forgejo:9.0.3
    restart: always
    environment:
      USER_UID: 1000
      USER_GID: 1000
+      GITEA____APP_NAME: JILITS Git
+      GITEA____APP_SLOGAN: Cloud Solutions with Integrity
      GITEA__database__DB_TYPE: postgres
      GITEA__database__HOST: db:5432
      GITEA__database__NAME: ${POSTGRES_DB}
@ -24,16 +25,18 @@ services:
      GITEA__service__DISABLE_REGISTRATION: "true"
      GITEA__service__NO_REPLY_ADDRESS: noreply.git.jilits.se
      GITEA__mailer__ENABLED: "true"
-      GITEA__mailer__MAILER_TYPE: smtp
-      GITEA__mailer__HOST: mail.jilits.se:587
-      GITEA__mailer__FROM: Gitea <git@jilits.se>
+      GITEA__mailer__PROTOCOL: smtp
+      GITEA__mailer__SMTP_ADDR: mail.jilits.se
+      GITEA__mailer__SMTP_PORT: 587
+      GITEA__mailer__FROM: Forgejo <git@jilits.se>
      GITEA__mailer__USER: ${SMTP_USER}
      GITEA__mailer__PASSWD: ${SMTP_PASS}
-      GITEA__time__FORMAT: "2006-01-02 15:04:05"
+      GITEA__time__FORMAT: "2007-01-02 15:04:05"
+      GITEA__other__SHOW_FOOTER_VERSION: "false"
    networks:
-      - gitea
+      - forgejo
    volumes:
-      - gitea:/data
+      - forgejo:/data
      - /etc/timezone:/etc/timezone:ro
      - /etc/localtime:/etc/localtime:ro
    ports:
@ -50,10 +53,10 @@ services:
      POSTGRES_USER: ${POSTGRES_USER}
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
    networks:
-      - gitea
+      - forgejo
    volumes:
      - db:/var/lib/postgresql/data

 volumes:
-  gitea:
+  forgejo:
  db:
Author	SHA1	Message	Date
BA1001	eb3bc1b811	chore: replace docker-compose with docker compose in service files	2024-12-25 22:23:00 +01:00
BA1001	1a601e3ab0	chore: replace gitea with forgejo	2024-12-25 22:21:11 +01:00