fix(staging): remove overriding file

bas-kirill · Aug 29, 2024 · aa8229a · aa8229a
1 parent 1c7258f
commit aa8229a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 25 deletions.
diff --git a/tools/docker/docker-compose.override.yml b/tools/docker/docker-compose.override.yml
diff --git a/tools/docker/docker-compose.yml b/tools/docker/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   muse-postgres:
     image: postgres:16.4
-    container_name: muse-postgres
+    container_name: "muse-postgres-${MUSE_STAGE}"
     restart: always
     environment:
       POSTGRES_USER: ${POSTGRES_USER}
@@ -26,13 +26,14 @@ services:
     profiles:
       - local
       - dev
+      - staging
       - prod
     labels:
       - io.portainer.accesscontrol.public
 
   muse-server:
-    image: muse-server:latest
-    container_name: muse-server
+    image: "${DOCKER_REPOSITORY}/muse-server:${MUSE_STAGE}-${MUSE_GIT_COMMIT_HASH}"
+    container_name: "muse-server-${MUSE_STAGE}"
     ports:
       - ${SERVER_PORT}:8080
       - ${SERVER_DEBUG_PORT}:5005
@@ -50,6 +51,7 @@ services:
     profiles:
       - local
       - dev
+      - staging
       - prod
     depends_on:
       muse-postgres:
@@ -58,8 +60,8 @@ services:
       - io.portainer.accesscontrol.public
 
   muse-client:
-    image: muse-client:latest
-    container_name: muse-client
+    image: "${DOCKER_REPOSITORY}/muse-client:${MUSE_STAGE}-${MUSE_GIT_COMMIT_HASH}"
+    container_name: "muse-client-${MUSE_STAGE}"
     ports:
       - ${CLIENT_PORT}:80
     environment:
@@ -69,13 +71,14 @@ services:
     profiles:
       - local
       - dev
+      - staging
       - prod
     labels:
       - io.portainer.accesscontrol.public
 
   muse-client-dev:
-    image: "muse-client-dev:latest"
-    container_name: muse-client-dev
+    image: "${DOCKER_REPOSITORY}/muse-client-dev:${MUSE_STAGE}-${MUSE_GIT_COMMIT_HASH}"
+    container_name: "muse-client-dev-${MUSE_STAGE}"
     ports:
       - ${CLIENT_DEV_PORT}:3000
     volumes:
@@ -85,7 +88,7 @@ services:
       - muse
     profiles:
       - local
-#  portainer:
+##  portainer:
 #    image: portainer/portainer-ce:linux-amd64-2.20.3-alpine
 #    container_name: portainer
 #    environment:

diff --git a/tools/scripts/clean.sh b/tools/scripts/clean.sh
@@ -42,7 +42,7 @@ export MUSE_STAGE="$stage"
 
 #https://github.com/docker/docs/issues/20709
 (cd "$rootDir" && docker compose \
-  -f ./tools/docker/docker-compose.override.yml \
+  -f ./tools/docker/docker-compose.yml \
   --env-file ./tools/docker/env/$stage.env \
   --project-name=muse-$stage \
   rm -f)

diff --git a/tools/scripts/run.sh b/tools/scripts/run.sh
@@ -41,13 +41,17 @@ export DOCKER_REPOSITORY=$dockerRepository
 export MUSE_GIT_COMMIT_HASH="$(git rev-parse --short HEAD)"
 export MUSE_STAGE="$stage"
 
+echo "muse stage: '${MUSE_STAGE}"
+echo "DOCKER_REPOSITORY: '${DOCKER_REPOSITORY}"
+echo "MUSE_GIT_COMMIT_HASH: '${MUSE_GIT_COMMIT_HASH}"
+
 (cd "$rootDir" && docker compose \
   -f ./tools/docker/docker-compose.yml \
-  -f ./tools/docker/docker-compose.override.yml \
   --env-file ./tools/docker/env/$stage.env \
   --project-name=muse-$stage \
   --profile "$stage" \
   up -d \
   --remove-orphans)
 
-echo -e "\033[0;32m[$stage] Docker Serviced has been started.\n\033[0m"
+
+echo -e "\033[0;32m[$stage] Docker Services has been started.\n\033[0m"
diff --git a/tools/scripts/stop.sh b/tools/scripts/stop.sh
@@ -41,7 +41,7 @@ export MUSE_GIT_COMMIT_HASH="$(git rev-parse --short HEAD)"
 export MUSE_STAGE="$stage"
 
 (cd "$rootDir" && docker compose \
-  -f ./tools/docker/docker-compose.override.yml \
+  -f ./tools/docker/docker-compose.yml \
   --env-file ./tools/docker/env/$stage.env \
   --project-name=muse-$stage \
   down -v \