Merge pull request #218 from overture-stack/rc/2.2.1

Rc/2.2.1
overture-stack · Dec 13, 2019 · 05f9add · 05f9add
2 parents 79e9d36 + 066785e
commit 05f9add
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -39,6 +39,7 @@ FROM ubuntu:18.04 as client
 
 ENV JDK_DOWNLOAD_URL https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_linux-x64_bin.tar.gz
 ENV SCORE_CLIENT_HOME /score-client
+ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCORE_CLIENT_HOME/bin
 
 # Update apt, add FUSE support and basic command line tools
 RUN \

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -6,6 +6,7 @@ FROM ubuntu:18.04 as client
 ENV JDK_DOWNLOAD_URL https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_linux-x64_bin.tar.gz
 ENV SCORE_CLIENT_HOME /score-client
 ENV CLIENT_DIST_DIR    /score-client-dist
+ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCORE_CLIENT_HOME/bin
 
 # Update apt, add FUSE support and basic command line tools
 RUN \

diff --git a/Makefile b/Makefile
@@ -12,6 +12,8 @@ MVN_EXE := $(shell which mvn)
 # Variables
 DOCKERFILE_NAME := $(shell if [ $(DEMO_MODE) -eq 1 ]; then echo Dockerfile; else echo Dockerfile.dev; fi)
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+MY_UID := $$(id -u)
+MY_GID := $$(id -g)
 THIS_USER := $$(id -u):$$(id -g)
 PROJECT_NAME := $(shell echo $(ROOT_DIR) | sed 's/.*\///g')
 PROJECT_VERSION := $(shell $(MVN_EXE) -f $(ROOT_DIR) help:evaluate -Dexpression=project.version -q -DforceStdout 2>&1  | tail -1)
@@ -36,7 +38,7 @@ RETRY_CMD := $(DOCKER_DIR)/retry-command.sh
 # Commands
 DOCKER_COMPOSE_CMD := echo "*********** DEMO_MODE = $(DEMO_MODE) **************" \
 	&& echo "*********** FORCE = $(FORCE) **************" \
-	&& DOCKERFILE_NAME=$(DOCKERFILE_NAME) $(DOCKER_COMPOSE_EXE) -f $(ROOT_DIR)/docker-compose.yml
+	&& MY_UID=$(MY_UID) MY_GID=$(MY_GID) DOCKERFILE_NAME=$(DOCKERFILE_NAME) $(DOCKER_COMPOSE_EXE) -f $(ROOT_DIR)/docker-compose.yml
 SCORE_CLIENT_CMD := $(DOCKER_COMPOSE_CMD) run --rm -u $(THIS_USER) score-client bin/score-client
 SCORE_CLIENT_TEST := $(DOCKER_COMPOSE_CMD) run --rm -u $(THIS_USER) score-client /data/run_tests.sh
 SCORE_CLIENT_MANIFEST_TEST := $(DOCKER_COMPOSE_CMD) run --rm -u $(THIS_USER) score-client /data/test_manifests.sh

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -99,6 +99,7 @@ services:
       - "./docker/score-client-init:/data"
       - "./docker/scratch/score-client-logs:/score-client/logs"
     command: bin/score-client
+    user: "$MY_UID:$MY_GID"
   song-db:
     image: "postgres:9.6"
     environment:

diff --git a/docker/tools/score-client-demo b/docker/tools/score-client-demo
@@ -6,4 +6,4 @@ BASH_SCRIPT_DIR=$( dirname  "${BASH_SCRIPT}")
 DOCKERFILE_NAME=Dockerfile \
 	docker-compose \
 	-f ${BASH_SCRIPT_DIR}/../../docker-compose.yml \
-	run --rm score-client bin/score-client $@
+	run --rm score-client score-client $@
diff --git a/docker/tools/score-client-dev b/docker/tools/score-client-dev
@@ -6,4 +6,4 @@ BASH_SCRIPT_DIR=$( dirname  "${BASH_SCRIPT}")
 DOCKERFILE_NAME=Dockerfile.dev \
 	docker-compose \
 	-f ${BASH_SCRIPT_DIR}/../../docker-compose.yml \
-	run --rm score-client bin/score-client $@
+	run --rm score-client score-client $@
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
 
   <groupId>bio.overture</groupId>
   <artifactId>score</artifactId>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
   <packaging>pom</packaging>
 
   <name>${project.artifactId}</name>

diff --git a/score-client/pom.xml b/score-client/pom.xml
@@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/score-core/pom.xml b/score-core/pom.xml
@@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/score-fs/pom.xml b/score-fs/pom.xml
@@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/score-server/pom.xml b/score-server/pom.xml
@@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/score-test/pom.xml b/score-test/pom.xml
@@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>