Merge pull request #7 from SAP/i500940/dev

Fix docker environment

.gitattributes

@@ -0,0 +1,42 @@
+# Taken from https://github.com/alexkaratarakis/gitattributes/blob/master/LICENSE.md - Copyright (c) 2015 Alexander Karatarakis
+
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+#
+# The above will handle all files NOT found below
+#
+# These files are text and should be normalized (Convert crlf => lf)
+*.css           text
+*.df            text
+*.htm           text
+*.html          text
+*.java          text
+*.js            text
+*.json          text
+*.jsp           text
+*.jspf          text
+*.jspx          text
+*.properties    text
+*.sh            text
+*.tld           text
+*.txt           text
+*.tag           text
+*.tagx          text
+*.xml           text
+*.yml           text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.class         binary
+*.dll           binary
+*.ear           binary
+*.gif           binary
+*.ico           binary
+*.jar           binary
+*.jpg           binary
+*.jpeg          binary
+*.png           binary
+*.so            binary
+*.war           binary

docker/README.md

@@ -37,7 +37,7 @@ At this point, you are ready to perform the actual build with the following comm
 
 ```
 docker build --tag vulas-build-img -f docker/Dockerfile --build-arg http_proxy= --build-arg https_proxy=  . 
-docker run -it --rm -v $(pwd):/vulas --env-file ./docker/.env vulas-build-img
+docker run -it --rm -v ${PWD}:/vulas --env-file ./docker/.env vulas-build-img
 ```
 
 In case you are running behind a proxy you need to configure it in the `--build-arg` arguments.

docker/docker-compose.yml

@@ -85,7 +85,7 @@ services:
     ports:
       - "8032:5432"
     volumes:
-      - "./data/postgresql:/var/lib/postgresql/data"
+      - vulas-os-postgres-data:/var/lib/postgresql/data
 
   rest-backend:
     container_name: vulas-os-rest-backend
@@ -126,3 +126,6 @@ services:
         - "8092"
     volumes:
       - "./data/rest-lib-utils:/root/"
+
+volumes:
+  vulas-os-postgres-data:

docker/rest-backend/run.sh

@@ -20,4 +20,4 @@ java \
     -Dvulas.jira.pwd=$JIRA_PASSWORD \
     $FLYWAY_OPTS \
     -Dspring.profiles.active=docker \
-	-jar /vulas/vulas-backend.jar
+	-jar /vulas/rest-backend.jar