Merge branch 'master' of gitlab.com:rusty-bever/deployment

ansible/roles/docker/files/daemon.json

@@ -2,7 +2,5 @@
     "metrics-addr" : "0.0.0.0:9323",
     "experimental" : true,
     "mtu": 1450,
-    "network-control-plane-mtu": 1450,
+    "network-control-plane-mtu": 1450
-    "ipv6": true,
-    "fixed-cidr-v6": "fd00::/80"
 }

stacks/matrix.yml

@@ -24,7 +24,7 @@ services:
         - 'traefik.http.middlewares.cors-headers.headers.accessControlAllowMethods=GET, POST, PUT, DELETE, OPTIONS'
 
     configs:
-      - source: conduit_v4
+      - source: conduit_v5
         target: '/srv/conduit/conduit.toml'
     networks:
       - 'default'
@@ -94,7 +94,7 @@ services:
       - 'signald:/signald'
 
   signald:
-    image: 'signald/signald:latest'
+    image: 'signald/signald:0.16.1'
 
     deploy:
       mode: 'replicated'
@@ -148,7 +148,7 @@ services:
       - 'irc:/data'
 
 configs:
-  conduit_v4:
+  conduit_v5:
     external: true
 
 networks:

stacks/woodpecker.yml

@@ -31,6 +31,9 @@ services:
     networks:
       - default
       - public
+    ports:
+      # Used for external agents to connect
+      - 9000:9000
 
   db:
     image: 'postgres:14.1-alpine'
@@ -56,7 +59,7 @@ services:
     volumes:
       - 'db-data:/var/lib/postgresql/data'
 
-  agent:
+  agent-1:
     image: 'woodpeckerci/woodpecker-agent:latest'
     command: agent
 
@@ -64,7 +67,23 @@ services:
       mode: 'global'
       placement:
         constraints:
-          - 'node.labels.class.ci==true'
+          - 'node.hostname==gamma'
+
+    environment:
+      - 'WOODPECKER_SERVER=app:9000'
+      - 'WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET}'
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+
+  agent-2:
+    image: 'woodpeckerci/woodpecker-agent:latest'
+    command: agent
+
+    deploy:
+      mode: 'global'
+      placement:
+        constraints:
+          - 'node.hostname==alpha'
 
     environment:
       - 'WOODPECKER_SERVER=app:9000'