From 95173d9825e7cbc370d53b76ae532796f82bb3e7 Mon Sep 17 00:00:00 2001 From: Tristan Date: Tue, 7 May 2019 23:20:45 -0400 Subject: [PATCH] Run docker image as jenkins user (#80) * Run docker image as jenkins user * create gradle folder with proper permissions so that docker does not create one owned by root automatically --- docker-compose.ci.yml | 2 +- scripts/cibuild | 1 + scripts/update | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index f8e117935..56be13191 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '2.3' services: forgehax: image: gradle:4.10.0-jdk8-slim - user: root + user: "1002:1002" environment: - GIT_COMMIT=${GIT_COMMIT:-latest} - FORGEHAX_DEBUG=1 diff --git a/scripts/cibuild b/scripts/cibuild index 12c9567b8..1a6156c21 100755 --- a/scripts/cibuild +++ b/scripts/cibuild @@ -23,6 +23,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then if [ "${1:-}" = "--help" ]; then usage else + mkdir -p .gradle GIT_COMMIT="${GIT_COMMIT}" docker-compose \ -f docker-compose.ci.yml \ run --rm \ diff --git a/scripts/update b/scripts/update index ae004d157..80292dae2 100755 --- a/scripts/update +++ b/scripts/update @@ -17,6 +17,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then if [ "${1:-}" = "--help" ]; then usage else + mkdir -p .gradle docker-compose \ -f docker-compose.ci.yml \ run --rm \