Merge pull request #305 from tapis-project/dev

quotes cleanup
tapis-project · Oct 17, 2023 · 0d4ab6b · 0d4ab6b
2 parents deb384d + dd954fd
commit 0d4ab6b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/playbooks/roles/jobs/templates/docker/docker-compose.yml b/playbooks/roles/jobs/templates/docker/docker-compose.yml
@@ -26,8 +26,6 @@ services:
             - TAPIS_QUEUE_USER=jobs
             - TAPIS_REQUEST_LOGGING_FILTER_PREFIXES=/v3/jobs
             - TAPIS_REQUEST_LOGGING_INGORE_SUFFIXES=/healthcheck;/ready;/hello
-        #        - name: TAPIS_LOG_DIRECTORY
-        #          value: "/opt/tomcat/logs"
             - CATALINA_OPTS=-Xms1g -Xmx3g --add-opens java.base/java.time=ALL-UNNAMED
         env_file:
             - {{ tapisdatadir }}/jobs/env
@@ -73,11 +71,11 @@ services:
     #     container_name: jobs-pgadmin
     #     image: {{ jobs_postgres_image }}
     #     environment:
-    #         - PGDATA="/pgdata/data"
+    #         - PGDATA=/pgdata/data
     #     env_file:
-    #         - "{{ tapisdatadir }}/jobs/env"
+    #         - {{ tapisdatadir }}/jobs/env
     #     volumes:
-    #         - "{{ tapisdatadir }}/jobs/jobs-pg-data:/pgdata"
+    #         - {{ tapisdatadir }}/jobs/jobs-pg-data:/pgdata
 
     jobs-rabbitmq:
         container_name: jobs-rabbitmq

diff --git a/playbooks/roles/tenants/templates/docker/docker-compose.yml b/playbooks/roles/tenants/templates/docker/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       - POSTGRES_USER=tenants
       - POSTGRES_DB=tenants
     env_file:
-      - "{{ tapisdatadir }}/tenants/env"
+      - {{ tapisdatadir }}/tenants/env
     healthcheck:
             test: ["CMD-SHELL", "pg_isready -U postgres"]
             interval: 5s
@@ -32,7 +32,7 @@ services:
     container_name: tenants-migrations
     image: {{ tenants_migrations_image }}
     volumes:
-      - "./tenants-config.json:/home/tapis/config.json"
+      - ./tenants-config.json:/home/tapis/config.json
     networks:
       - tapis
     depends_on:
@@ -43,24 +43,24 @@ services:
       - postgres_user=tenants 
       - postgres_database=tenants
     env_file: 
-      - "{{ tapisdatadir }}/tenants/env"
+      - {{ tapisdatadir }}/tenants/env
     command: ['upgrade']
 
   tenants-api:
     container_name: tenants-api
     image: {{ tenants_api_image }}
     volumes:
     #   - ./service.log:/home/tapis/service.log
-      - "./tenants-config.json:/home/tapis/config.json"
-      - "./tenants-service.log:/home/tapis/service.log"
+      - ./tenants-config.json:/home/tapis/config.json
+      - ./tenants-service.log:/home/tapis/service.log
     networks:
       - tapis
     environment:
       - sql_db_url={{ tenants_postgres_url }}
       - postgres_user=tenants
       - postgres_database=tenants
     env_file: 
-      - "{{ tapisdatadir }}/tenants/env"
+      - {{ tapisdatadir }}/tenants/env
     depends_on:
       tenants-migrations:
         condition: service_completed_successfully

diff --git a/playbooks/roles/tokens/templates/docker/docker-compose.yml b/playbooks/roles/tokens/templates/docker/docker-compose.yml
@@ -15,4 +15,4 @@ services:
         networks:
             - tapis
         env_file: 
-            - "{{ tapisdatadir }}/tokens/env"
+            - {{ tapisdatadir }}/tokens/env