From de3fafedec9c81e979cf6243119895dd74441ffa Mon Sep 17 00:00:00 2001
From: ITQ <itq.dev@ya.ru>
Date: Mon, 7 Apr 2025 20:52:03 +0300
Subject: [PATCH] ci: fixed VERSION setting

---
 .gitlab-ci.yml |  3 ++-
 compose.yaml   | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a015311..1c6635d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,6 +93,8 @@ deploy:
     - AUTH_COMMAND="echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin";
     - ssh -p $SSH_PORT $SSH_ADDRESS "$AUTH_COMMAND" > /dev/null 2>&1
 
+    - SET_VERSION="echo "VERSION=$DEPLOYMENT_VERSION" > ~/deploy/.env"
+
     - scp -P $SSH_PORT -C -r infrastructure/ compose.yaml $SSH_ADDRESS:~/deploy/ > /dev/null 2>&1
     - |
       ssh -p $SSH_PORT $SSH_ADDRESS > /dev/null 2>&1 <<'EOF'
@@ -100,7 +102,6 @@ deploy:
 
       docker system prune --force > deploy.log 2>&1
 
-      export VERSION="$DEPLOYMENT_VERSION"
       docker compose pull --policy always -q > deploy.log 2>&1
       docker compose up -d --remove-orphans --force-recreate >> deploy.log 2>&1
       docker compose ps >> deploy.log 2>&1
diff --git a/compose.yaml b/compose.yaml
index 09fd60c..ac775af 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -149,7 +149,7 @@ services:
     restart: unless-stopped
 
   redis:
-    image: docker.io/redis:7-alpine3.21
+    image: docker.io/redis:7.2-alpine
     command: redis-server /usr/local/etc/redis/redis.conf
     configs:
       - source: redis_config
@@ -189,7 +189,7 @@ services:
     shm_size: 4mb
 
   postgres:
-    image: docker.io/postgres:17-alpine3.21
+    image: docker.io/postgres:17.4-alpine
     configs:
       - source: postgres_config
         target: /etc/postgresql/postgresql.conf
@@ -302,8 +302,8 @@ services:
         target: /etc/grafana/scripts
 
   minio:
-    command: server --console-address ":9001"
     image: docker.io/minio/minio:RELEASE.2025-02-03T21-03-04Z
+    command: server --console-address ":9001"
     healthcheck:
       test: ["CMD", "mc", "ready", "local"]
       interval: 1m30s
@@ -334,7 +334,7 @@ services:
         target: /data
 
   prometheus:
-    image: docker.io/prom/prometheus:v3.1.0
+    image: docker.io/prom/prometheus:v3.2.1
     command:
       - "--config.file=/etc/prometheus/prometheus.yaml"
     configs:
@@ -413,7 +413,7 @@ services:
         target: /tmp
 
   proxy:
-    image: docker.io/nginx:1.27-alpine3.21
+    image: docker.io/nginx:1.27-alpine
     configs:
       - source: nginx_config
         target: /etc/nginx/nginx.conf