Merge branch 'master' into release

# Conflicts:
#	_docker-compose.override.yml
#	docker-compose.yml

.env

@@ -1,3 +1,3 @@
 COMPOSE_PROJECT_NAME=OpenTOSCA
 COMPOSE_CONVERT_WINDOWS_PATHS=1
-PUBLIC_HOSTNAME=container
+PUBLIC_HOSTNAME=localhost

README.md

@@ -33,7 +33,7 @@ Wait a few seconds, then open the [OpenTOSCA user interface](http://localhost:80
 
 **NOTE:** Please check the [Docker Daemon Settings](#docker-daemon-settings)
 
-**NOTE:** In an optimal setup `localhost` should be replaced by a publicly available Fully-Qualified Domain Name or IP address.
+**NOTE:** In an optimal setup `localhost` should be replaced by a publicly available Fully-Qualified Domain Name or IP address directly in the `.env` file.
 
 ---
 
@@ -49,8 +49,6 @@ Simple How-To section to cover different kinds of use cases.
 > ```shell
 > cp _docker-compose.override.yml docker-compose.override.yml
 > ```
-> Update the `docker-compose.override.yml` by replacing all `<your public ip address>` with either your IP-address or a Fully-Qualified Domain Name.
-> **NOTE**: Otherwise, the Completion feature cannot be used!
 >
 > Similarly, replace the `CONTAINER_HOSTNAME: <public ip address of the container>` with the Full-Qualified Domain Name or IP address of the container.
 `
@@ -138,8 +136,8 @@ docker-compose -f docker-compose.yml -f docker-compose.bps.yml up -d
 
   ```shell
   docker-compose exec winery bash
-  rm -rf /var/opentosca/repository
-  git clone https://github.com/OpenTOSCA/tosca-definitions-internal /var/opentosca/repository
+  rm -rf ${WINERY_REPOSITORY_PATH}
+  git clone https://github.com/OpenTOSCA/tosca-definitions-internal ${WINERY_REPOSITORY_PATH}
   exit
   ```
 

_docker-compose.override.yml

@@ -25,20 +25,9 @@ services:
     #   - <path on host system>:/usr/local/tomcat/webapps
     # ports:
     #   - '1883:1883' # MQTT
-  container-repository:
-    environment:
-      WINERY_HOSTNAME: <your public ip address>
-      # WORKFLOWMODELER_HOSTNAME: <your public ip address>
-      # TOPOLOGYMODELER_HOSTNAME: <your public ip address>
-      # CONTAINER_HOSTNAME: <public ip address of the container>
   winery:
     environment:
       WINERY_REPOSITORY_URL: https://github.com/OpenTOSCA/tosca-definitions-public
-      # WINERY_HOSTNAME: <your public ip address>
-      # WORKFLOWMODELER_HOSTNAME: <your public ip address>
-      # TOPOLOGYMODELER_HOSTNAME: <your public ip address>
-      # CONTAINER_HOSTNAME: <public ip address of the container>
-
   dind:
     environment:
       # University of Stuttgart internal DNS settings

docker-compose.yml

@@ -29,6 +29,10 @@ services:
       WINERY_PORT: 8091
       WORKFLOWMODELER_PORT: 8091
       TOPOLOGYMODELER_PORT: 8091
+      WINERY_HOSTNAME: ${PUBLIC_HOSTNAME}
+      WORKFLOWMODELER_HOSTNAME: ${PUBLIC_HOSTNAME}
+      TOPOLOGYMODELER_HOSTNAME: ${PUBLIC_HOSTNAME}
+      CONTAINER_HOSTNAME: ${PUBLIC_HOSTNAME}
     ports:
       - '8091:8080'
     networks:
@@ -53,6 +57,11 @@ services:
       - opentosca
   winery:
     image: opentosca/winery:v2.2.1-M1
+    environment:
+      WINERY_HOSTNAME: ${PUBLIC_HOSTNAME}
+      WORKFLOWMODELER_HOSTNAME: ${PUBLIC_HOSTNAME}
+      TOPOLOGYMODELER_HOSTNAME: ${PUBLIC_HOSTNAME}
+      CONTAINER_HOSTNAME: ${PUBLIC_HOSTNAME}
     ports:
       - '8080:8080'
     networks: