Updates to docker container

Author: jamesfwood

install/docker/console-db-es-ls-kibana/docker-compose.yml

@@ -17,17 +17,12 @@ services:
       interval: 3s
       timeout: 1s
       retries: 5
-  #  networks:
-  #    - backend
   es:
     labels:
       com.example.service: "es"
       com.example.description: "For searching and indexing data"
     image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0
     container_name: cws-es
-  #  networks:
-  #    - frontend
-  #    - backend
     ports:
       - "9200:9200"
       - "9300:9300"
@@ -105,9 +100,6 @@ services:
       - "38443:38443"
       - "31616:31616"
     hostname: cws-console
-  #  networks:
-  #    - frontend
-  #    - backend
     environment:
        - DB_HOST=db
        - DB_USER=root
@@ -122,6 +114,7 @@ services:
       retries: 12
     volumes:
       - ./config.properties:/home/cws_user/config.properties:ro
+      - ~/.cws/creds:/root/.cws/creds:ro
       - console-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.75/logs
   cws-worker:
     container_name: cws-worker1
@@ -134,9 +127,6 @@ services:
       - es
       - cws
     hostname: cws-worker1
-  #  networks:
-  #    - frontend
-  #    - backend
     environment:
       - DB_HOST=db
       - DB_USER=root
@@ -146,14 +136,13 @@ services:
       - ES_PORT=9200
     volumes:
       - ./worker-config.properties:/home/cws_user/config.properties:ro
+      - ~/.cws/creds:/root/.cws/creds:ro
       - worker1-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.75/logs
 
 volumes:
   console-logs-volume:
   worker1-logs-volume:
 
 networks:
-  default:
-    external:
-      name: cws-network
-
+  cws-network:
+    external: true

install/docker/cws-image/startup.sh

@@ -8,11 +8,6 @@ ls /home/cws_user/cws/server/apache-tomcat-9.0.75/logs
 # Clear out any previous logs before starting (Note: Previous logs will cause CWS not to start)
 rm -rf /home/cws_user/cws/server/apache-tomcat-9.0.75/logs/*
 
-mkdir ~/.cws
-echo "changeit" > ~/.cws/creds
-chmod 700 ~/.cws
-chmod 600 ~/.cws/creds
-
 cd cws
 ./configure.sh ../config.properties Y
 

install/docker/worker-ls/docker-compose.yml

@@ -47,6 +47,5 @@ volumes:
   worker2-logs-volume:
 
 networks:
-  default:
-    external:
-      name: cws-network
+  cws-network:
+    external: true