From ca59d303e046a1f460dc71e976c4fcf9f7301d70 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Sun, 4 Apr 2021 13:39:38 +0200
Subject: [PATCH] Auto-add service labels

---
 compose.simplesaml.yml |  8 +-------
 compose.yml            | 16 +++-------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/compose.simplesaml.yml b/compose.simplesaml.yml
index abf40ce..26c0a8c 100644
--- a/compose.simplesaml.yml
+++ b/compose.simplesaml.yml
@@ -1,6 +1,4 @@
----
 version: "3.8"
-
 services:
   app:
     volumes:
@@ -12,7 +10,6 @@ services:
       - SAML_REAL_NAME_ATTRIBUTE
       - SAML_SERVICE_PROVIDER
       - SAML_USERNAME_ATTRIBUTE
-
   simplesaml:
     image: venatorfox/simplesamlphp:latest
     secrets:
@@ -59,12 +56,10 @@ services:
         - "traefik.http.routers.${STACK_NAME}_simplesaml.rule=(Host(`${DOMAIN}`) && PathPrefix(`/simplesaml`))"
         - "traefik.http.routers.${STACK_NAME}_simplesaml.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}_simplesaml.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.simplesaml.version=${ABRA_TYPE_SIMPLESAML_VERSION}-${ABRA_TYPE_SIMPLESAML_DIGEST}"
-
+        - coop-cloud.${STACK_NAME}.simplesaml.version=latest-9308832b
 volumes:
   simplesaml:
   simplesaml_log:
-
 secrets:
   saml_admin_password:
     name: ${STACK_NAME}_saml_admin_password_${SECRET_SAML_ADMIN_PASSWORD_VERSION}
@@ -72,7 +67,6 @@ secrets:
   saml_secret_salt:
     name: ${STACK_NAME}_saml_secret_salt_${SECRET_SAML_SECRET_SALT_VERSION}
     external: true
-
 configs:
   entrypoint_saml_conf:
     name: ${STACK_NAME}_entrypoint_saml_${SAML_ENTRYPOINT_CONF_VERSION}
diff --git a/compose.yml b/compose.yml
index e047285..64146de 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,6 +1,4 @@
----
 version: "3.8"
-
 services:
   app:
     image: mediawiki:1.35.1
@@ -43,9 +41,8 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
-        - "coop-cloud.${STACK_NAME}.app.version=${ABRA_TYPE_APP_VERSION}-${ABRA_TYPE_APP_DIGEST}"
+        - coop-cloud.${STACK_NAME}.app.version=1.35.1-f88c009f
     entrypoint: /docker-entrypoint2.sh
-
   db:
     image: mariadb:10.5
     environment:
@@ -61,9 +58,7 @@ 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']
   parsoid:
     image: thenets/parsoid:0.11.0
     hostname: parsoidserver
@@ -72,18 +67,14 @@ services:
     environment:
       PARSOID_DOMAIN_localhost: http://app:80/api.php
     deploy:
-      labels:
-        - "coop-cloud.${STACK_NAME}.parsoid.version=${ABRA_TYPE_PARSOID_VERSION}-${ABRA_TYPE_PARSOID_DIGEST}"
-
+      labels: ['coop-cloud.${STACK_NAME}.parsoid.version=0.11.0-c06d6623']
 volumes:
   mariadb:
   mediawiki_images:
-
 networks:
   proxy:
     external: true
   internal:
-
 secrets:
   db_root_password:
     name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
@@ -94,7 +85,6 @@ secrets:
   mediawiki_secret_key:
     name: ${STACK_NAME}_mediawiki_secret_key_${SECRET_MEDIAWIKI_SECRET_KEY_VERSION}
     external: true
-
 configs:
   LocalSettings_conf:
     name: ${STACK_NAME}_local_settings_${LOCAL_SETTINGS_CONF_VERSION}