build

__swarm/regsync/regsync-swarm.yml

@@ -21,8 +21,8 @@ services:
     volumes:
     - config:/home/appuser/
     - /etc/localtime:/etc/localtime
-    labels:
-        service_name: 'regsync'
+    # labels:
+    #     service_name: 'regsync'
     deploy:
       labels:
         wud.watch: 'true'

__swarm/semaphore/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       SEMAPHORE_ADMIN: administrator
       SEMAPHORE_ADMIN_EMAIL: administrator@sectorq.eu
       SEMAPHORE_ADMIN_NAME: administrator
-      SEMAPHORE_ADMIN_PASSWORD: $SEMAPHORE_ADMIN_PASSWORD
+      SEMAPHORE_ADMIN_PASSWORD: administrator
       SEMAPHORE_DB: semaphore_db
       SEMAPHORE_DB_HOST: db
       SEMAPHORE_DB_PASS: StrongPassw0rd
@@ -21,7 +21,7 @@ services:
       SEMAPHORE_LDAP_DN_SEARCH: dc=sectorq,dc=eu
       SEMAPHORE_LDAP_HOST: 192.168.77.101
       SEMAPHORE_LDAP_NEEDTLS: 'no'
-      SEMAPHORE_LDAP_PASSWORD: $LDAP_ADMIN_PASSWORD
+      SEMAPHORE_LDAP_PASSWORD: administrator
       SEMAPHORE_LDAP_PORT: '2389'
       SEMAPHORE_LDAP_SEARCH_FILTER: (&(objectClass=inetOrgPerson)(uid=%s))
       SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/

__swarm/semaphore/semaphore-swarm.yml

@@ -3,12 +3,14 @@ services:
     dns:
     - 192.168.77.101
     - 192.168.77.1
+    secrets:
+    - semaphore_admin_password
     environment:
       SEMAPHORE_ACCESS_KEY_ENCRYPTION: MflCLIUF5bn6Lgkuwy4BoAdIFhoZ4Ief2oocXmuZSjs=
-      SEMAPHORE_ADMIN: administrator
-      SEMAPHORE_ADMIN_EMAIL: administrator@sectorq.eu
-      SEMAPHORE_ADMIN_NAME: administrator
-      SEMAPHORE_ADMIN_PASSWORD: $SEMAPHORE_ADMIN_PASSWORD
+      SEMAPHORE_ADMIN: admin
+      SEMAPHORE_ADMIN_EMAIL: jaydee@sectorq.eu
+      SEMAPHORE_ADMIN_NAME: admin
+      SEMAPHORE_ADMIN_PASSWORD_FILE: /run/secrets/semaphore_admin_password
       SEMAPHORE_DB: semaphore_db
       SEMAPHORE_DB_HOST: db
       SEMAPHORE_DB_PASS: StrongPassw0rd
@@ -19,7 +21,7 @@ services:
       SEMAPHORE_LDAP_DN_SEARCH: dc=sectorq,dc=eu
       SEMAPHORE_LDAP_HOST: 192.168.77.101
       SEMAPHORE_LDAP_NEEDTLS: 'no'
-      SEMAPHORE_LDAP_PASSWORD: $LDAP_ADMIN_PASSWORD
+      SEMAPHORE_LDAP_PASSWORD: administrator
       SEMAPHORE_LDAP_PORT: '2389'
       SEMAPHORE_LDAP_SEARCH_FILTER: (&(objectClass=inetOrgPerson)(uid=%s))
       SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/
@@ -39,9 +41,6 @@ services:
         wud.watch: 'true'
         wud.watch.digest: 'true'
       replicas: 1
-      placement:
-        constraints:
-        - node.role == manager
   db:
     environment:
       MYSQL_DATABASE: semaphore_db
@@ -56,9 +55,9 @@ services:
         wud.watch: 'true'
         wud.watch.digest: 'true'
       replicas: 1
-      placement:
-        constraints:
-        - node.role == manager
 volumes:
   data:
   db:
+secrets:
+  semaphore_admin_password:
+    external: true