services/cojedzie-next/stack.yml

@@ -75,8 +75,8 @@ services:
     depends_on:
       - api
     environment:
-      - COJEDZIE_GTM={{ cojedzie_gtm }}
+      - APP_GTM={{ cojedzie_gtm }}
-      - COJEDZIE_MAPTILER_KEY={{ cojedzie_maptiler }}
+      - APP_MAPTILER_KEY={{ cojedzie_maptiler }}
     deploy:
       mode: replicated
       replicas: 1

services/gitea/stack.yml

@@ -5,7 +5,7 @@ volumes:
 
 services:
   server:
-    image: gitea/gitea:1.16.9
+    image: gitea/gitea:1.16.1
     environment:
       - USER_UID={{ git_user.uid }}
       - USER_GID={{ git_user.group }}

services/portainer/vars/main.yml

@@ -1,2 +1,2 @@
 ---
-portainer_version: 2.14.2
+portainer_version: 2.13.1

services/registry/stack.yml

@@ -16,30 +16,17 @@ services:
     configs:
       - source: registry_{{ registry_config.checksum }}
         target: /etc/docker/registry/config.yml
-    environment:
-      - REGISTRY_STORAGE_DELETE_ENABLED=true
     deploy:
       placement:
         constraints:
           - node.role == manager
-    networks: ['default']
-
-  ui:
-    image: joxit/docker-registry-ui:2.2.1
-    environment:
-        - DELETE_IMAGES=true
-        - REGISTRY_TITLE=Kadet's private registry
-        - NGINX_PROXY_PASS_URL=http://registry:5000
-        - SINGLE_REGISTRY=true
-    depends_on: ['registry']
-    deploy:
       labels:
         - traefik.enable=true
         - traefik.http.routers.{{ service }}.rule=Host(`{{ service }}.{{ main_domain }}`)
         - traefik.http.routers.{{ service }}.tls=true
         - traefik.http.routers.{{ service }}.tls.certresolver=lets-encrypt
-        - traefik.http.services.{{ service }}.loadbalancer.server.port=80
+        - traefik.http.services.{{ service }}.loadbalancer.server.port=5000
-    networks: ['{{ ingress_network }}', 'default']
+    networks: ['{{ ingress_network }}']
 
   image-cleanup-job:
     image: registry:2

services/traefik/stack.yml

@@ -2,7 +2,7 @@ version: "{{ compose_version }}"
 
 services:
   ingress:
-    image: traefik:v2.8
+    image: traefik:v2.5
     env_file:
       - ./ovh.env
     ports:

vars/services.yml

@@ -111,15 +111,6 @@ service_config:
           3266326630393535660a393764376130343264643064613131393663333836356337613566343130
           65353438613864373962636463613836313034633963613834393233376136313861303538346265
           6139666332373137303962646530353364333732353339313262
-      - name: andrzej
-        password: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          31363166663163363363663939306336336363383038376434616434306465623365313734383963
-          3166643832663764636535323365363861346530346336340a656461303331646662663561373534
-          36646666626461396635643764663237356636333165636565646434656530366238383765356234
-          6361376166366438640a323166363063373033356466633839316433613566643734633930363766
-          30633736373161383238303262393635393436393637323639366135323530316666623030343633
-          6131663563663936316632373565363566343364613666363366
     registry_storage:
       s3:
         accesskey: !vault |