From 59b380476fd624245e331bc0ab195091789c8292 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Fri, 26 Aug 2016 19:40:26 +0200
Subject: [PATCH] Fix Docker build
---
Dockerfile.builder | 2 +-
captain.yml | 2 +-
docker/builder/build-in-docker.sh | 0
3 files changed, 2 insertions(+), 2 deletions(-)
mode change 100644 => 100755 docker/builder/build-in-docker.sh
diff --git a/Dockerfile.builder b/Dockerfile.builder
index e29bec4b2..132c3e771 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -14,4 +14,4 @@ VOLUME /build
# Define working directory
WORKDIR /build
-CMD ["/build-in-docker.sh"]
+ENTRYPOINT ["/build-in-docker.sh"]
diff --git a/captain.yml b/captain.yml
index b60b3172d..782b43d80 100644
--- a/captain.yml
+++ b/captain.yml
@@ -9,7 +9,7 @@ builder:
post:
- echo "Finished building portal backend builder image"
- echo "Building project..."
- - docker run --rm -v $WORKSPACE:/build/ -v $HOME/.m2:/home/build/.m2/ portal-backend-builder
+ - docker run --rm -v $WORKSPACE:/build/ -v $HOME/.m2:/home/build/.m2/ portal-backend-builder:latest
- echo "Finished building project"
test:
- ./tests/test-build.sh
diff --git a/docker/builder/build-in-docker.sh b/docker/builder/build-in-docker.sh
old mode 100644
new mode 100755
--
GitLab