FIXUP: Move Traefik labels inside deploy directive for proper Swarm routing

stack.production.yml

@@ -22,16 +22,6 @@ services:
         parallelism: 1
         delay: 10s
         order: stop-first
-    environment:
-      BASE_URL: "https://cal.colinknapp.com"
-      DEBUG_MODE: "TRUE"
-      DB_HOST: "mariadb"
-      DB_NAME: "easyappointments"
-      DB_USERNAME: "root"
-      DB_PASSWORD: "secret"
-    networks:
-      - traefik
-      - default
       labels:
         - traefik.enable=true
         - traefik.http.routers.production_easy-appointments.rule=Host(`cal.colinknapp.com`)
@@ -43,6 +33,16 @@ services:
         # - traefik.http.services.production_easy-appointments.loadbalancer.healthcheck.interval=30s
         # - traefik.http.services.production_easy-appointments.loadbalancer.healthcheck.timeout=5s
         - traefik.http.routers.production_easy-appointments.middlewares=secure-headers
+    environment:
+      BASE_URL: "https://cal.colinknapp.com"
+      DEBUG_MODE: "TRUE"
+      DB_HOST: "mariadb"
+      DB_NAME: "easyappointments"
+      DB_USERNAME: "root"
+      DB_PASSWORD: "secret"
+    networks:
+      - traefik
+      - default
     logging:
       driver: "json-file"
       options:

stack.staging.yml

@@ -22,6 +22,13 @@ services:
         parallelism: 1
         delay: 10s
         order: stop-first
+      labels:
+        - traefik.enable=true
+        - traefik.http.routers.staging_easy-appointments.rule=Host(`staging.cal.colinknapp.com`)
+        - traefik.http.routers.staging_easy-appointments.entrypoints=websecure
+        - traefik.http.routers.staging_easy-appointments.tls=true
+        - traefik.http.routers.staging_easy-appointments.tls.certresolver=letsencryptresolver
+        - traefik.http.services.staging_easy-appointments.loadbalancer.server.port=80
     environment:
       BASE_URL: "https://staging.cal.colinknapp.com"
       DEBUG_MODE: "FALSE"
@@ -32,13 +39,6 @@ services:
     networks:
       - traefik
       - default
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.staging_easy-appointments.rule=Host(`staging.cal.colinknapp.com`)
-      - traefik.http.routers.staging_easy-appointments.entrypoints=websecure
-      - traefik.http.routers.staging_easy-appointments.tls=true
-      - traefik.http.routers.staging_easy-appointments.tls.certresolver=letsencryptresolver
-      - traefik.http.services.staging_easy-appointments.loadbalancer.server.port=80
 
   mariadb:
     image: git.nixc.us/colin/easy-appointments:staging-mariadb