Merge branch 'dev' into main

datainsider-co · Apr 5, 2023 · 42623c5 · 42623c5
2 parents 9329440 + f18ef17
commit 42623c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -15,7 +15,10 @@ pipeline {
 
         stage('deploy') {
             when {
-                expression { BRANCH_NAME ==~ /(main|dev)/ }
+		anyOf {
+                    expression { BRANCH_NAME ==~ /(main|dev)/ }
+		    buildingTag()
+		}
             }
 
             steps {

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -56,7 +56,8 @@ services:
       HTTP_PORT: 8080
     volumes:
       - ./bi-service/logs:/app/logs
-      - bi-service-data:/tmp/csv
+      - biservice-csvdata:/tmp/csv
+      - biservice-mapdata:/app/mapdata
     depends_on:
       - mysql
       - ssdb
@@ -104,13 +105,15 @@ services:
       - 5050:80
     volumes:
       - ./nginx/log/:/var/log/nginx/
-      - bi-service-data:/var/www/html/public/static/tmp/csv
+      - biservice-csvdata:/var/www/html/public/static/tmp/csv
+      - biservice-mapdata:/var/www/html/public/static/mapdata
     depends_on:
       - bi_service
       - web
 
 volumes:
-  bi-service-data:
+  biservice-csvdata:
+  biservice-mapdata:
 
 networks:
   rocket_network: