diff --git a/.docker-compose.cluster.yml b/.docker-compose.cluster.yml index bfb59e9..f4a209c 100644 --- a/.docker-compose.cluster.yml +++ b/.docker-compose.cluster.yml @@ -3,7 +3,7 @@ version: '3.8' services: #Here is the ODC app app-odc: - image: git.h2-invent.com/datenschutzcenter/application:3.0.5 + image: git.h2-invent.com/datenschutzcenter/application: depends_on: db-odc: condition: service_healthy diff --git a/.docker-compose.http.yml b/.docker-compose.http.yml index 57921b1..fd6f8e0 100644 --- a/.docker-compose.http.yml +++ b/.docker-compose.http.yml @@ -17,7 +17,7 @@ services: #Here is the ODC app app-odc: - image: git.h2-invent.com/datenschutzcenter/application:3.0.6 + image: git.h2-invent.com/datenschutzcenter/application: depends_on: db-odc: condition: service_healthy diff --git a/.docker-compose.https.yml b/.docker-compose.https.yml index c200ef1..a6d6df7 100644 --- a/.docker-compose.https.yml +++ b/.docker-compose.https.yml @@ -47,7 +47,7 @@ services: #Here is the ODC app app-odc: - image: git.h2-invent.com/datenschutzcenter/application:3.0.4 + image: git.h2-invent.com/datenschutzcenter/application: depends_on: db-odc: condition: service_healthy diff --git a/setup.sh b/setup.sh index 7d64fbc..e25fefd 100644 --- a/setup.sh +++ b/setup.sh @@ -47,18 +47,23 @@ else source $FILE fi - HTTP_METHOD=${HTTP_METHOD:=http} - read -p "Enter http/https for testing on local environment ALWAYS use http [$HTTP_METHOD]: " input - HTTP_METHOD=${input:=$HTTP_METHOD} - sed -i '/HTTP_METHOD/d' $FILE - echo "HTTP_METHOD=$HTTP_METHOD" >> $FILE +VERSION=${VERSION:=latest} +read -p "Which Release Version do you want to install [$VERSION]: " input +VERSION=${input:=$VERSION} +sed -i '/VERSION/d' $FILE +echo "VERSION=$VERSION" >> $FILE - PUBLIC_URL=${PUBLIC_URL:=dev.domain.de} - read -p "Enter the url you want to enter the open-datenschutzcenter without http://, https:// or ports [$PUBLIC_URL]: " input - PUBLIC_URL=${input:=$PUBLIC_URL} - sed -i '/PUBLIC_URL/d' $FILE - echo "PUBLIC_URL=$PUBLIC_URL" >> $FILE +HTTP_METHOD=${HTTP_METHOD:=http} +read -p "Enter http/https for testing on local environment ALWAYS use http [$HTTP_METHOD]: " input +HTTP_METHOD=${input:=$HTTP_METHOD} +sed -i '/HTTP_METHOD/d' $FILE +echo "HTTP_METHOD=$HTTP_METHOD" >> $FILE +PUBLIC_URL=${PUBLIC_URL:=dev.domain.de} +read -p "Enter the url you want to enter the open-datenschutzcenter without http://, https:// or ports [$PUBLIC_URL]: " input +PUBLIC_URL=${input:=$PUBLIC_URL} +sed -i '/PUBLIC_URL/d' $FILE +echo "PUBLIC_URL=$PUBLIC_URL" >> $FILE HOST_IP=$(ip a | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1' | head -n 1) @@ -128,7 +133,7 @@ cp .docker-compose.$HTTP_METHOD.yml docker-compose.yml sed -i "s||$PUBLIC_URL|g" docker-compose.yml sed -i "s||$HOST_IP|g" docker-compose.yml - +sed -i "s||$VERSION|g" docker-compose.yml echo "" echo ""