Migrating from git.autonomic.zone repo

compose.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  gitea:
+  app:
     image: "gitea/gitea:1.12.5"
     configs:
       - source: app_ini
@@ -12,16 +12,28 @@ services:
       - internal_token
       - jwt_secret
       - secret_key
+      - smtp_passwd
     environment:
-      - GITEA_APP_NAME=${APP_NAME}
-      - GITEA_DB_HOST=${DB_HOST}
-      - GITEA_DB_NAME=${DB_NAME}
-      - GITEA_DB_TYPE=${DB_TYPE}
-      - GITEA_DB_USER=${DB_USER}
+      - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
+      - GITEA_APP_NAME
+      - GITEA_AUTO_WATCH_NEW_REPOS
+      - GITEA_DB_HOST=mariadb:3306
+      - GITEA_DB_NAME=gitea
+      - GITEA_DB_TYPE=mysql
+      - GITEA_DB_USER=gitea
+      - GITEA_DISABLE_REGISTRATION
       - GITEA_DOMAIN=${DOMAIN}
-      - GITEA_SSH_PORT=${SSH_HOST_PORT}
+      - GITEA_ENABLE_NOTIFY_MAIL
+      - GITEA_ENABLE_OPENID_SIGNIN
+      - GITEA_ENABLE_OPENID_SIGNUP
+      - GITEA_MAILER_FROM
+      - GITEA_MAILER_HOST
+      - GITEA_MAILER_USER
+      - GITEA_SSH_PORT
     volumes:
       - "git:/data"
+      - "/etc/timezone:/etc/timezone:ro"
+      - "/etc/localtime:/etc/localtime:ro"
     networks:
       - proxy
       - internal
@@ -30,24 +42,22 @@ services:
       interval: 15s
       timeout: 10s
       retries: 10
-      start_period: 15s
+      start_period: 30s
     deploy:
       update_config:
         failure_action: rollback
         order: start-first
       labels:
         - "traefik.enable=true"
-
         - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.gitea.entrypoints=web-secure"
         - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-        - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV:production}"
-
+        - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
         - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh"
-        - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${SSH_HOST_PORT}"
+        - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}"
 
-  mariadb:
+  database:
     image: "mariadb:10.5"
     command: |
       mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
@@ -71,25 +81,28 @@ networks:
 
 configs:
   app_ini:
-    name: ${APP_INI_VERSION}
+    name: ${STACK_NAME}_app_ini_${APP_INI_VERSION}
     file: app.ini.tmpl
     template_driver: golang
 
 secrets:
   db_passwd:
-    name: ${DB_PASSWD_VERSION}
+    name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}
     external: true
   db_root_passwd:
-    name: ${DB_ROOT_PASSWD_VERSION}
+    name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}
     external: true
   internal_token:
-    name: ${INTERNAL_TOKEN_VERSION}
+    name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION}
     external: true
   jwt_secret:
-    name: ${JWT_SECRET_VERSION}
+    name: ${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION}
     external: true
   secret_key:
-    name: ${SECRET_KEY_VERSION}
+    name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}
+    external: true
+  smtp_passwd:
+    name: ${STACK_NAME}_smtp_passwd_${SMTP_PASSWD_VERSION}
     external: true
 
 volumes: