Merge pull request #1452 from unfetter-discover/hotfix-issue-1446

Fixed problem where the socket server was always mapping to local dir…

Author: j987987

ansible/roles/socket-server/tasks/main.yml

@@ -40,10 +40,5 @@
       SEND_EMAIL_ALERTS: false
       # This is only needed if using SEND_EMAIL_ALERTS *AND* private-config.email.json does not have a service email address
       SERVICE_EMAIL: ''
-    volumes: 
-      - "certs:/etc/pki/tls/certs:ro"
-      - "{{ prepath }}/unfetter-store/unfetter-socket-server/src:/usr/share/unfetter-socket-server/src"
-      - "{{ prepath }}/unfetter-store/unfetter-socket-server/dist:/usr/share/unfetter-socket-server/dist"
-      - "private-config:/usr/share/unfetter-socket-server/config/private"
-      #- "private-config/config/config/private-config.email.json:/usr/share/unfetter-socket-server/config/private-config.email.json"    
+    volumes: "{{ volume_list }}"  
   when: "(use_uac) and (run_action)"      

ansible/roles/socket-server/vars/main.yml

@@ -4,3 +4,7 @@ dir: "unfetter-store/unfetter-socket-server"
 path: "{{ prepath + dir}}"
 container_name: unfetter-socket-server
 image_name: "{{registry}}{{ container_name }}:{{docker_tag}}"
+
+base_list: "certs:/etc/pki/tls/certs:ro,private-config:/usr/share/unfetter-socket-server/config/private"
+dev_volume_list: ",{{ prepath }}/unfetter-store/unfetter-socket-server/src:/usr/share/unfetter-socket-server/src,{{ prepath }}/unfetter-store/unfetter-socket-server/dist:/usr/share/unfetter-socket-server/dist"
+volume_list: "{{ base_list }}{{ dev_volume_list if run_mode == 'dev' else '' }}"