Now using relative paths for Mount-Locations instead of ${PWD}

Solves issue #122

Author: Chris Wiechmann

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added new optional parameter: UNRESTRICTED_PERMISSIONS to control which users see all traffic [#120](https://github.com/Axway-API-Management-Plus/apigateway-openlogging-elk/issues/120)
 - API-Builder version changed from Ottawa to Quezon
 - Updated Custom-Flow Nodes dependencies
+- Now using relative paths instead of using $PWD to mount volumes [#122](https://github.com/Axway-API-Management-Plus/apigateway-openlogging-elk/issues/122)
 
 ## [3.2.0] 2021-06-22
 ### Fixed

docker-compose.yml

@@ -25,11 +25,11 @@ services:
     ports:
       - 5044:5044
     volumes:
-      - ${PWD}/logstash/config/pipelines.yml:/usr/share/logstash/config/pipelines.yml
-      - ${PWD}/logstash/pipelines:/usr/share/logstash/pipelines
-      - ${PWD}/logstash/index_templates:/usr/share/logstash/index_templates
-      - ${PWD}/config/certificates:/usr/share/logstash/config/certificates
-      - ${PWD}/logstash/scripts:/usr/share/logstash/scripts
+      - ./logstash/config/pipelines.yml:/usr/share/logstash/config/pipelines.yml
+      - ./logstash/pipelines:/usr/share/logstash/pipelines
+      - ./logstash/index_templates:/usr/share/logstash/index_templates
+      - ./config/certificates:/usr/share/logstash/config/certificates
+      - ./logstash/scripts:/usr/share/logstash/scripts
     #command: logstash --path.config /usr/share/logstash/pipelines/pipelines.yml
     depends_on:
       - apibuilder4elastic
@@ -83,7 +83,7 @@ services:
     networks:
       - elastic
     volumes:
-      - ${PWD}/config:/app/config
+      - ./config:/app/config
       - ${APIGATEWAY_PAYLOADS_FOLDER}:/var/log/payloads
     logging:
       options:

elasticsearch/docker-compose.es01.yml

@@ -45,9 +45,9 @@ services:
       - type: volume
         source: esdata1
         target: /usr/share/elasticsearch/data
-      - ${PWD}/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-      - ${PWD}/config/certificates:/usr/share/elasticsearch/config/certificates
-      - ${PWD}/elasticsearch/scripts:/usr/share/elasticsearch/scripts
+      - ./config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+      - ../config/certificates:/usr/share/elasticsearch/config/certificates
+      - ./scripts:/usr/share/elasticsearch/scripts
     networks:
       - elastic
     ports:

elasticsearch/docker-compose.es02.yml

@@ -45,9 +45,9 @@ services:
       - type: volume
         source: esdata2
         target: /usr/share/elasticsearch/data
-      - ${PWD}/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-      - ${PWD}/config/certificates:/usr/share/elasticsearch/config/certificates
-      - ${PWD}/elasticsearch/scripts:/usr/share/elasticsearch/scripts
+      - ./config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+      - ../config/certificates:/usr/share/elasticsearch/config/certificates
+      - ./scripts:/usr/share/elasticsearch/scripts
     networks:
       - elastic
     ports:

elasticsearch/docker-compose.es03.yml

@@ -45,9 +45,9 @@ services:
       - type: volume
         source: esdata3
         target: /usr/share/elasticsearch/data
-      - ${PWD}/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-      - ${PWD}/config/certificates:/usr/share/elasticsearch/config/certificates
-      - ${PWD}/elasticsearch/scripts:/usr/share/elasticsearch/scripts
+      - ./config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+      - ../config/certificates:/usr/share/elasticsearch/config/certificates
+      - ./scripts:/usr/share/elasticsearch/scripts
     networks:
       - elastic
     ports:

elasticsearch/docker-compose.es04.yml

@@ -45,9 +45,9 @@ services:
       - type: volume
         source: esdata4
         target: /usr/share/elasticsearch/data
-      - ${PWD}/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-      - ${PWD}/config/certificates:/usr/share/elasticsearch/config/certificates
-      - ${PWD}/elasticsearch/scripts:/usr/share/elasticsearch/scripts
+      - ./config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+      - ../config/certificates:/usr/share/elasticsearch/config/certificates
+      - ./scripts:/usr/share/elasticsearch/scripts
     networks:
       - elastic
     ports:

elasticsearch/docker-compose.es05.yml

@@ -45,9 +45,9 @@ services:
       - type: volume
         source: esdata5
         target: /usr/share/elasticsearch/data
-      - ${PWD}/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-      - ${PWD}/config/certificates:/usr/share/elasticsearch/config/certificates
-      - ${PWD}/elasticsearch/scripts:/usr/share/elasticsearch/scripts
+      - ./config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+      - ../config/certificates:/usr/share/elasticsearch/config/certificates
+      - ./scripts:/usr/share/elasticsearch/scripts
     networks:
       - elastic
     ports:

filebeat/docker-compose.filebeat.yml

@@ -29,15 +29,15 @@ services:
         source: filebeatdata
         target: /usr/share/filebeat/data # Required to make sure that Filebeat remembers the last position, even if the container is recreated
       - /etc/localtime:/etc/localtime:ro # Required to sync timezone of API-Gateway into the Filebeat Docker-Container
-      - ${PWD}/filebeat/filebeat.yml:/usr/share/filebeat/filebeat.yml
+      - ./filebeat.yml:/usr/share/filebeat/filebeat.yml
+      - ../config/certificates:/usr/share/filebeat/config/certificates
+      - ./scripts:/usr/local/scripts
       - ${APIGATEWAY_OPENTRAFFIC_FOLDER}:/var/log/opentraffic
       - ${APIGATEWAY_TRACES_FOLDER}:/var/log/trace
       - ${APIGATEWAY_EVENTS_FOLDER}:/var/log/events
       - ${APIGATEWAY_AUDITLOGS_FOLDER}:/var/log/audit
       - /var/lib/docker/containers:/var/lib/docker/containers:ro
       - /var/run/docker.sock:/var/run/docker.sock
-      - ${PWD}/config/certificates:/usr/share/filebeat/config/certificates
-      - ${PWD}/filebeat/scripts:/usr/local/scripts
     networks:
       - elastic
     logging:

kibana/docker-compose.kibana.yml

@@ -25,9 +25,9 @@ services:
       - type: volume
         source: logs
         target: /var/log
-      - ${PWD}/kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml
-      - ${PWD}/config/certificates:/usr/share/kibana/config/certificates
-      - ${PWD}/kibana/scripts:/usr/share/kibana/scripts
+      - ./config/kibana.yml:/usr/share/kibana/config/kibana.yml
+      - ../config/certificates:/usr/share/kibana/config/certificates
+      - ./scripts:/usr/share/kibana/scripts
     ulimits:
       memlock:
         soft: -1

metricbeat/docker-compose.metricbeat.yml

@@ -29,12 +29,12 @@ services:
         source: metricbeatdata
         target: /usr/share/metricbeat/data # Required to make sure that Filebeat remembers the last position, even if the container is recreated
       - /etc/localtime:/etc/localtime:ro # Required to sync timezone of the server into the Filebeat Docker-Container
-      - ${PWD}/metricbeat/config:/usr/share/metricbeat/config
-      - ${PWD}/metricbeat/activeDashboards:/usr/share/metricbeat/activeDashboards
+      - ./config:/usr/share/metricbeat/config
+      - ./activeDashboards:/usr/share/metricbeat/activeDashboards
       - /var/lib/docker/containers:/var/lib/docker/containers:ro
       - /var/run/docker.sock:/var/run/docker.sock
-      - ${PWD}/config/certificates:/usr/share/metricbeat/config/certificates
-      - ${PWD}/metricbeat/scripts:/usr/local/scripts
+      - ../config/certificates:/usr/share/metricbeat/config/certificates
+      - ./scripts:/usr/local/scripts
     networks:
       - elastic
     logging: