remove v3 specific docker vars

DesignSafe-CI · Jul 17, 2024 · 6d9fb2b · 6d9fb2b
1 parent e608c40
commit 6d9fb2b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/conf/docker/docker-compose-dev.all.debug.m1.yml b/conf/docker/docker-compose-dev.all.debug.m1.yml
@@ -3,7 +3,7 @@ services:
     image: redis:7
     platform: "linux/amd64"
     volumes:
-      - redis_data_v3:/data
+      - des_redis_data:/data
     ports:
       - 127.0.0.1:6379:6379
     container_name: des_redis
@@ -12,7 +12,7 @@ services:
   rabbitmq:
     image: arm64v8/rabbitmq:3.6.14-management
     volumes:
-      - rabbitmq_data_v3:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq
+      - des_rabbitmq_data:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq
     env_file: ../env_files/rabbitmq.env
     ports:
       - 127.0.0.1:5672:5672
@@ -35,7 +35,7 @@ services:
     volumes:
       - ../elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
       - ../elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties
-      - es_data_v3:/usr/share/elasticsearch/data
+      - des_es_data:/usr/share/elasticsearch/data
     ports:
       - 127.0.0.1:9200:9200
     container_name: des_elasticsearch
@@ -49,7 +49,7 @@ services:
       - POSTGRES_DB=ds_database
       - PGDATA=/var/lib/postgresql/data/ds_database
     volumes:
-      - des_postgres_data_v3:/var/lib/postgresql/data
+      - des_postgres_data:/var/lib/postgresql/data
     hostname: des_postgres
     ports:
       -   127.0.0.1:5432:5432
@@ -76,7 +76,7 @@ services:
     hostname: des_nginx
 
   django:
-    image: designsafeci/portal:tapis-v3
+    image: designsafeci/portal:local
     env_file: ../env_files/designsafe.env
     links:
       - memcached:memcached
@@ -97,7 +97,7 @@ services:
     hostname: des_django
 
   websockets:
-    image: designsafeci/portal:tapis-v3
+    image: designsafeci/portal:local
     env_file: ../env_files/designsafe.env
     volumes:
       - ../../.:/srv/www/designsafe
@@ -107,7 +107,7 @@ services:
     command: python manage.py runserver 0.0.0.0:9000
 
   workers:
-    image: designsafeci/portal:tapis-v3
+    image: designsafeci/portal:local
     env_file: ../env_files/designsafe.env
     links:
       - memcached:memcached
@@ -126,7 +126,7 @@ services:
     hostname: des_workers
 
 volumes:
-  redis_data_v3:
-  des_postgres_data_v3:
-  es_data_v3:
-  rabbitmq_data_v3:
+  des_redis_data:
+  des_postgres_data:
+  des_es_data:
+  des_rabbitmq_data:
diff --git a/conf/docker/docker-compose-dev.all.debug.yml b/conf/docker/docker-compose-dev.all.debug.yml
@@ -2,7 +2,7 @@ services:
   redis:
     image: redis:7
     volumes:
-      - redis_data_v3:/data
+      - des_redis_data:/data
     ports:
       - 127.0.0.1:6379:6379
     container_name: des_redis
@@ -11,7 +11,7 @@ services:
   rabbitmq:
     image: rabbitmq:3.6.10-management
     volumes:
-      - rabbitmq_data_v3:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq
+      - des_rabbitmq_data:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq
     env_file: ../env_files/rabbitmq.env
     ports:
       - 127.0.0.1:5672:5672
@@ -32,7 +32,7 @@ services:
     volumes:
       - ../elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
       - ../elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties
-      - es_data_v3:/usr/share/elasticsearch/data
+      - des_es_data:/usr/share/elasticsearch/data
     ports:
       - 127.0.0.1:9200:9200
     container_name: des_elasticsearch
@@ -46,7 +46,7 @@ services:
       - POSTGRES_DB=ds_database
       - PGDATA=/var/lib/postgresql/data/ds_database
     volumes:
-      - des_postgres_data_v3:/var/lib/postgresql/data
+      - des_postgres_data:/var/lib/postgresql/data
     hostname: des_postgres
     ports:
       -   127.0.0.1:5432:5432
@@ -72,7 +72,7 @@ services:
     hostname: des_nginx
 
   django:
-    image: designsafeci/portal:tapis-v3
+    image: designsafeci/portal:local
     env_file: ../env_files/designsafe.env
     links:
       - memcached:memcached
@@ -93,7 +93,7 @@ services:
     hostname: des_django
 
   websockets:
-    image: designsafeci/portal:tapis-v3
+    image: designsafeci/portal:local
     env_file: ../env_files/designsafe.env
     volumes:
       - ../../.:/srv/www/designsafe
@@ -103,7 +103,7 @@ services:
     command: python manage.py runserver 0.0.0.0:9000
 
   workers:
-    image: designsafeci/portal:tapis-v3
+    image: designsafeci/portal:local
     env_file: ../env_files/designsafe.env
     links:
       - memcached:memcached
@@ -122,7 +122,7 @@ services:
     hostname: des_workers
 
 volumes:
-  redis_data_v3:
-  des_postgres_data_v3:
-  es_data_v3:
-  rabbitmq_data_v3:
+  des_redis_data:
+  des_postgres_data:
+  des_es_data:
+  des_rabbitmq_data:
diff --git a/conf/docker/docker-compose-dev.yml b/conf/docker/docker-compose-dev.yml
@@ -4,7 +4,7 @@ services:
         context: ../../.
         dockerfile: conf/docker/Dockerfile
         target: development
-      image: designsafeci/portal:tapis-v3
+      image: designsafeci/portal:local
       env_file: ../env_files/designsafe.env
       command: /bin/bash
       container_name: des_django
diff --git a/conf/docker/docker-compose.yml b/conf/docker/docker-compose.yml
@@ -3,7 +3,7 @@ services:
       build:
         context: ../../.
         dockerfile: conf/docker/Dockerfile
-      image: designsafeci/portal:tapis-v3
+      image: designsafeci/portal:local
       env_file: ../env_files/designsafe.env
       command: /bin/bash
       container_name: des_django