From 91b530f84c9bfdbcf97e92c7d969e7deb672570c Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Wed, 29 Jul 2026 11:29:12 +0300
Subject: [PATCH] build(docker): add DOCKER_TAG env variable

---
 .env-base             | 1 +
 docker-compose.yaml   | 8 ++++----
 scripts/docker-action | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.env-base b/.env-base
index 659c0d9..510adcf 100644
--- a/.env-base
+++ b/.env-base
@@ -4,5 +4,6 @@ DOCKER_ROOT="$DOCKER_REPO/$DOCKER_GROUP"
 VERSION=$(grep -m 1 'version' ./pyproject.toml | grep -oP 'version\s*=\s*"\K[^"]+')
 PYTHON_VERSION=$(grep -m 1 'python' ./pyproject.toml | grep -oP 'python\s*=\s*"\^?\K[^"]+')
 DOCKER_PROJECTS=("gallery")
+DOCKER_TAG=latest
 
 OPENWEATHER_KEY="<EMPTY>"
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 22a98b7..c1c7ce1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,15 +1,15 @@
-name: gallery
+name: gallery-${DOCKER_TAG}
 
 services:
   redis:
-    container_name: gallery-redis
+    container_name: gallery-${DOCKER_TAG}-redis
     image: redis:alpine
     stop_grace_period: 3s
     volumes:
       - redis_data:/data
   app:
-    container_name: gallery-app
-    image: ${DOCKER_ROOT}/gallery
+    container_name: gallery-${DOCKER_TAG}-app
+    image: ${DOCKER_ROOT}/gallery:${DOCKER_TAG}
     environment:
       - REDIS_HOST=redis
       - OPENWEATHER_KEY=$OPENWEATHER_KEY
diff --git a/scripts/docker-action b/scripts/docker-action
index 04f6a28..b3ba66c 100755
--- a/scripts/docker-action
+++ b/scripts/docker-action
@@ -29,9 +29,9 @@ publish () {
   for PROJECT in "${DOCKER_PROJECTS[@]}"; do
     IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
     docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$VERSION
-    docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:latest
+    docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$DOCKER_TAG
     docker push $DOCKER_ROOT/$PROJECT_NAME:$VERSION
-    docker push $DOCKER_ROOT/$PROJECT_NAME:latest
+    docker push $DOCKER_ROOT/$PROJECT_NAME:$DOCKER_TAG
   done
 }