From 6ac7233b9cbf735932de3fa6a33495df47d341b5 Mon Sep 17 00:00:00 2001
From: TonyFord <tonyford@strategy-investor.de>
Date: Tue, 30 Jun 2020 13:37:26 +0200
Subject: [PATCH] remove user ids
---
.gitlab-ci.yml | 4 ++++
Dockerfile | 8 ++++----
docker-compose.yml | 6 +++---
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95fd984..2d4b5cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,8 @@ build-faircoind:
variables:
- $CMD =~ /build/
before_script:
+ - export RUNNER_UID=`id -u`
+ - export RUNNER_GID=`id -g`
- mkdir -p ~/.faircoin2
- source ${FAIRCOIN_CONF}
- echo -e "rpcconnect=${rpcconnect}\nrpcport=${rpcport}\nrpcuser=${rpcuser}\nrpcpassword=${rpcpassword}\ntxindex=1" > ~/.faircoin2/faircoin.conf
@@ -34,6 +36,8 @@ start-faircoind:
variables:
- $CMD =~ /build|start/
before_script:
+ - export RUNNER_UID=`id -u`
+ - export RUNNER_GID=`id -g`
- chmod +x ./script/blocknotify.sh
script:
- docker-compose stop
diff --git a/Dockerfile b/Dockerfile
index 3e81e67..49265e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,10 +35,10 @@ RUN rm -rf /var/lib/apt/lists/* && \
#####################################################################################root##
### create and run user account to image ##################################################
-ARG GITLAB_RUNNER_GID
-ARG GITLAB_RUNNER_UID
-RUN groupadd -g $GITLAB_RUNNER_GID faircoin
-RUN useradd --create-home --shell /bin/bash faircoin --uid $GITLAB_RUNNER_UID --gid $GITLAB_RUNNER_GID
+ARG RUNNER_GID
+ARG RUNNER_UID
+RUN groupadd -g $RUNNER_GID faircoin
+RUN useradd --create-home --shell /bin/bash faircoin --uid $RUNNER_UID --gid $RUNNER_GID
USER faircoin
#################################################################################faircoin##
diff --git a/docker-compose.yml b/docker-compose.yml
index a6a6e99..8ffb249 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,8 +7,8 @@ services:
context: ./
args:
source_repository: "https://github.com/faircoin/faircoin.git"
- GITLAB_RUNNER_UID: "${GITLAB_RUNNER_UID}"
- GITLAB_RUNNER_GID: "${GITLAB_RUNNER_GID}"
+ RUNNER_UID: "${RUNNER_UID}"
+ RUNNER_GID: "${RUNNER_GID}"
FAIRCOIN_PORT: ${FAIRCOIN_PORT}
env_file:
- ../faircoind.tmp/FAIRCOIN_CONF
@@ -16,7 +16,7 @@ services:
restart: always
command: '-disablewallet -port=${FAIRCOIN_PORT} -blocknotify=/home/faircoin/script/blocknotify.sh'
network_mode: "host"
- user: "${GITLAB_RUNNER_UID}:${GITLAB_RUNNER_GID}"
+ user: "${RUNNER_UID}:${RUNNER_GID}"
volumes:
- ~/.faircoin2:/home/faircoin/.faircoin2
- ./script:/home/faircoin/script
--
GitLab