From 7536b3930e6d648e2ca9099c3e625926e4c66e5e Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Sun, 4 Apr 2021 18:03:12 +0200
Subject: [PATCH] Auto-add service labels

---
 .env.sample |  6 +++---
 compose.yml | 12 ++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.env.sample b/.env.sample
index 4b0249a..6848751 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,10 +1,10 @@
 TYPE=gitea
 STACK_NAME=gitea
 
-DOMAIN=git.exaple.com
+DOMAIN=git.example.com
 LETS_ENCRYPT_ENV=production
 
-GITEA_DOMAIN=git.exaple.com
+GITEA_DOMAIN=git.example.com
 GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
 GITEA_APP_NAME="Git with solidaritea"
 GITEA_AUTO_WATCH_NEW_REPOS=false
@@ -27,4 +27,4 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 
 # Email
 #GITEA_MAILER_HOST=mail.gandi.net:465
-#SECRET_SMTP_PASSWORD_VERSION=v1
+SECRET_SMTP_PASSWORD_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 412c75e..c21fa4c 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,6 +1,4 @@
----
 version: "3.8"
-
 services:
   app:
     image: "gitea/gitea:1.13.6"
@@ -56,8 +54,7 @@ services:
         - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)"
         - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh"
         - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}"
-        - "coop-cloud.${STACK_NAME}.app.version=${ABRA_TYPE_APP_VERSION}-${ABRA_TYPE_APP_DIGEST}"
-
+        - coop-cloud.${STACK_NAME}.app.version=1.13.6-1d90f984
   db:
     image: "mariadb:10.5"
     command: |
@@ -75,20 +72,16 @@ services:
     networks:
       - internal
     deploy:
-      labels:
-        - "coop-cloud.${STACK_NAME}.db.version=${ABRA_TYPE_DB_VERSION}-${ABRA_TYPE_DB_DIGEST}"
-
+      labels: ['coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef']
 networks:
   internal:
   proxy:
     external: true
-
 configs:
   app_ini:
     name: ${STACK_NAME}_app_ini_${APP_INI_VERSION}
     file: app.ini.tmpl
     template_driver: golang
-
 # Note(decentral1se): migrate from passwd -> password
 # See https://git.autonomic.zone/coop-cloud/abra/pulls/33
 secrets:
@@ -110,7 +103,6 @@ secrets:
   smtp_passwd:
     name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION}
     external: true
-
 volumes:
   git:
   mariadb: