From 497b6bb9698a1f7d82b7867f6e91e2c4f9f624d3 Mon Sep 17 00:00:00 2001 From: khartmann Date: Mon, 9 Dec 2019 11:42:57 -0500 Subject: [PATCH 1/6] Enhancement: Docker file for score client now runs the client as user score with /score-client/bin in the PATH environment variable --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5ae014cb..a0dd104a 100644 --- 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 \ @@ -67,9 +68,11 @@ RUN mkdir /usr/lib/jvm \ # Copy client dist from previous docker build staget COPY --from=builder $CLIENT_DIST_DIR/* $SCORE_CLIENT_HOME/ +RUN groupadd -r score && useradd -r -g score score # Set working directory for convenience with interactive usage WORKDIR $SCORE_CLIENT_HOME +USER score ############################### # Score Server From 779d3a1e6b3d0c52141b1f6e0186309beee1541b Mon Sep 17 00:00:00 2001 From: khartmann Date: Mon, 9 Dec 2019 15:46:15 -0500 Subject: [PATCH 2/6] Changes as per PR --- Dockerfile.dev | 1 + Makefile | 2 ++ docker-compose.yml | 1 + docker/tools/score-client-demo | 2 +- docker/tools/score-client-dev | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 4d6fefa5..3132a161 100644 --- 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 index 815dfa98..6b339a48 100644 --- 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) diff --git a/docker-compose.yml b/docker-compose.yml index 463cb6d7..e69b7390 100644 --- 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_GUID" song-db: image: "postgres:9.6" environment: diff --git a/docker/tools/score-client-demo b/docker/tools/score-client-demo index c033e261..6bce5dad 100755 --- 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 index 7f294d5a..8b43c3ad 100755 --- 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 $@ From 1871a1dec17f5d96e5e616b9a02c3dc0092e565b Mon Sep 17 00:00:00 2001 From: khartmann Date: Mon, 9 Dec 2019 16:03:37 -0500 Subject: [PATCH 3/6] Per PR --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a0dd104a..91bc7206 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,11 +68,9 @@ RUN mkdir /usr/lib/jvm \ # Copy client dist from previous docker build staget COPY --from=builder $CLIENT_DIST_DIR/* $SCORE_CLIENT_HOME/ -RUN groupadd -r score && useradd -r -g score score # Set working directory for convenience with interactive usage WORKDIR $SCORE_CLIENT_HOME -USER score ############################### # Score Server From ee09eae23fa2e9f797e73273f6c550ca891d3d03 Mon Sep 17 00:00:00 2001 From: khartmann Date: Tue, 10 Dec 2019 10:30:31 -0500 Subject: [PATCH 4/6] Bugfix: test-upload-and-download now works again --- Makefile | 6 +++--- docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6b339a48..79189776 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +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)) +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) @@ -38,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 index e69b7390..134fc97b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -99,7 +99,7 @@ services: - "./docker/score-client-init:/data" - "./docker/scratch/score-client-logs:/score-client/logs" command: bin/score-client - user: "$MY_UID:$MY_GUID" + user: "$MY_UID:$MY_GID" song-db: image: "postgres:9.6" environment: From 4a264c243f57dd8301de0bdb337d535a90e5da16 Mon Sep 17 00:00:00 2001 From: Robert Tisma <942951+rtisma@users.noreply.github.com> Date: Tue, 10 Dec 2019 12:40:37 -0500 Subject: [PATCH 5/6] Merge Back 2.2.0-SNAPSHOT --- pom.xml | 2 +- score-client/pom.xml | 2 +- score-core/pom.xml | 2 +- score-fs/pom.xml | 2 +- score-server/pom.xml | 2 +- score-test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2788b59d..650f533c 100644 --- 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 bio.overture score - 2.2.0 + 2.2.0-SNAPSHOT pom ${project.artifactId} diff --git a/score-client/pom.xml b/score-client/pom.xml index a7b05a7e..da745320 100644 --- 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 bio.overture score - 2.2.0 + 2.2.0-SNAPSHOT ../pom.xml diff --git a/score-core/pom.xml b/score-core/pom.xml index 1ff0601e..c521d7f8 100644 --- 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 bio.overture score - 2.2.0 + 2.2.0-SNAPSHOT ../pom.xml diff --git a/score-fs/pom.xml b/score-fs/pom.xml index 89d22504..e9643bf6 100644 --- 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 bio.overture score - 2.2.0 + 2.2.0-SNAPSHOT ../pom.xml diff --git a/score-server/pom.xml b/score-server/pom.xml index a3080b40..59c738b0 100644 --- 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 bio.overture score - 2.2.0 + 2.2.0-SNAPSHOT ../pom.xml diff --git a/score-test/pom.xml b/score-test/pom.xml index 4b35d7cb..e42e0dfb 100644 --- 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 bio.overture score - 2.2.0 + 2.2.0-SNAPSHOT ../pom.xml From 066785ef4c0b23934490687a7b2f71320c16c772 Mon Sep 17 00:00:00 2001 From: Robert Tisma <942951+rtisma@users.noreply.github.com> Date: Thu, 12 Dec 2019 19:34:06 -0500 Subject: [PATCH 6/6] Release 2.2.1 --- pom.xml | 2 +- score-client/pom.xml | 2 +- score-core/pom.xml | 2 +- score-fs/pom.xml | 2 +- score-server/pom.xml | 2 +- score-test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 650f533c..6cba4e6f 100644 --- 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 bio.overture score - 2.2.0-SNAPSHOT + 2.2.1 pom ${project.artifactId} diff --git a/score-client/pom.xml b/score-client/pom.xml index da745320..942c9bf1 100644 --- 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 bio.overture score - 2.2.0-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/score-core/pom.xml b/score-core/pom.xml index c521d7f8..07053851 100644 --- 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 bio.overture score - 2.2.0-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/score-fs/pom.xml b/score-fs/pom.xml index e9643bf6..115262cb 100644 --- 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 bio.overture score - 2.2.0-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/score-server/pom.xml b/score-server/pom.xml index 59c738b0..4e20e6d5 100644 --- 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 bio.overture score - 2.2.0-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/score-test/pom.xml b/score-test/pom.xml index e42e0dfb..3bd4eaa4 100644 --- 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 bio.overture score - 2.2.0-SNAPSHOT + 2.2.1 ../pom.xml