Normalise Docker build

src/docker/run/Dockerfile → Dockerfile

@@ -7,7 +7,8 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize
 RUN tar -C /usr/local/bin -xvzf dockerize-linux-amd64-v0.2.0.tar.gz
 
 COPY ./target/portal-backend-DOCKER_BUILD.jar backend.jar
-COPY ./config/application.tmpl /config/application.tmpl
+COPY ./docker/runner/config/application.tmpl /config/application.tmpl
+COPY ./docker/runner/README.md /
 
 EXPOSE 8080
 

src/docker/build/Dockerfile → Dockerfile.builder

@@ -6,7 +6,7 @@ MAINTAINER mirco.nasuti@chuv.ch
 RUN adduser --quiet --uid 1000 build
 USER build
 
-COPY ./build-in-docker.sh /build-in-docker.sh
+COPY ./docker/builder/build-in-docker.sh /build-in-docker.sh
 
 VOLUME /opt/portal/
 WORKDIR /opt/portal/

build.sh

 #!/usr/bin/env bash
+set -e
 
-export WORKSPACE=$(pwd)
-captain build
+get_script_dir () {
+     SOURCE="${BASH_SOURCE[0]}"
+
+     while [ -h "$SOURCE" ]; do
+          DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+          SOURCE="$( readlink "$SOURCE" )"
+          [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+     done
+     cd -P "$( dirname "$SOURCE" )"
+     pwd
+}
+
+export WORKSPACE=$(get_script_dir)
+
+if pgrep -lf sshuttle > /dev/null ; then
+  echo "sshuttle detected. Please close this program as it messes with networking and prevents builds inside Docker to work"
+  exit 1
+fi
+
+if groups $USER | grep &>/dev/null '\bdocker\b'; then
+  CAPTAIN="captain"
+else
+  CAPTAIN="sudo captain"
+fi
+
+$CAPTAIN build

captain.yml

-portal-backend-build:
-  build: ./src/docker/build/Dockerfile
-  image: hbpmip/portal-backend-build
+# Builder image
+# Creates a portable environemnt to build this project.
+# Do not push this image to Docker hub.
+builder:
+  build: Dockerfile.builder
+  image: portal-backend-builder
   pre:
-    - echo "Building portal-backend-build"
+    - echo "Building portal backend builder"
   post:
     - docker run --rm -v $WORKSPACE:/opt/portal/ -v $HOME/.m2:/home/build/.m2/ hbpmip/portal-backend-build
-    - echo "Finished building portal-backend-build"
+    - echo "Finished building portal backend builder"
   test:
     - ./tests/test-build.sh
 
 portal-backend:
-  build: ./src/docker/run/Dockerfile
+  build: Dockerfile
   image: hbpmip/portal-backend
   pre:
     - echo "Building portal-backend"
-    - mkdir -p $WORKSPACE/src/docker/run/config $WORKSPACE/src/docker/run/target
-    - cp $WORKSPACE/config/application.tmpl $WORKSPACE/src/docker/run/config/
-    - cp $WORKSPACE/target/*.jar $WORKSPACE/src/docker/run/target/
   post:
-    - rm -rf $WORKSPACE/src/docker/run/target/
-    - rm -rf $WORKSPACE/src/docker/run/config/
     - echo "Finished building portal-backend"
   test:
     - ./tests/pre-test-run.sh

config/application.tmpl → docker/runner/config/application.tmpl

@@ -54,7 +54,7 @@ server:
     timeout: {{ default .Env.SESSION_TIMEOUT "2592000" }}
 
 # ENDPOINTS
-endpoints
+endpoints:
   enabled: true
   health:
     enabled: true

docker_push.sh

@@ -14,5 +14,17 @@ get_script_dir () {
 }
 
 export WORKSPACE=$(get_script_dir)
-captain push --branch-tags=false --commit-tags=true portal-backend
-curl -k -X POST --data-urlencode payload@$WORKSPACE/src/docker/run/slack.json https://hbps1.chuv.ch/slack/dev-activity
+
+if pgrep -lf sshuttle > /dev/null ; then
+  echo "sshuttle detected. Please close this program as it messes with networking and prevents builds inside Docker to work"
+  exit 1
+fi
+
+if groups $USER | grep &>/dev/null '\bdocker\b'; then
+  CAPTAIN="captain"
+else
+  CAPTAIN="sudo captain"
+fi
+
+$CAPTAIN push --branch-tags=false --commit-tags=true portal-backend
+curl -k -X POST --data-urlencode payload@$WORKSPACE/docker/runner/slack.json https://hbps1.chuv.ch/slack/dev-activity

test.sh

 #!/usr/bin/env bash
+set -e
 
-export WORKSPACE=$(pwd)
-captain test
\ No newline at end of file
+get_script_dir () {
+     SOURCE="${BASH_SOURCE[0]}"
+
+     while [ -h "$SOURCE" ]; do
+          DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+          SOURCE="$( readlink "$SOURCE" )"
+          [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+     done
+     cd -P "$( dirname "$SOURCE" )"
+     pwd
+}
+
+export WORKSPACE=$(get_script_dir)
+
+if pgrep -lf sshuttle > /dev/null ; then
+  echo "sshuttle detected. Please close this program as it messes with networking and prevents builds inside Docker to work"
+  exit 1
+fi
+
+if groups $USER | grep &>/dev/null '\bdocker\b'; then
+  CAPTAIN="captain"
+else
+  CAPTAIN="sudo captain"
+fi
+
+$CAPTAIN test