From f4627426a160de7f28696945f687399a08e6c500 Mon Sep 17 00:00:00 2001
From: TonyFord <tonyford@strategy-investor.de>
Date: Thu, 25 Jun 2020 13:14:37 +0200
Subject: [PATCH] create faircoin.conf at build stage
---
.gitlab-ci.yml | 2 ++
Dockerfile | 2 +-
docker-compose.yml | 3 +--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd7ca35..962a0cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,8 @@ build-faircoind:
- $CMD =~ /build/
before_script:
- mkdir -p ~/.faircoin2
+ - source ${FAIRCOIN_CONF}
+ - echo -e "rpcconnect=${rpcconnect}\nrpcport=${rpcport}\nrpcuser=${rpcuser}\nrpcpassword=${rpcpassword}\ntxindex=1" > ~/.faircoin2/faircoin.conf
script:
- docker-compose down
- docker-compose build
diff --git a/Dockerfile b/Dockerfile
index 8a84719..bad580e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,7 +66,7 @@ RUN mv ./faircoin-cli /home/faircoin/faircoin-cli
WORKDIR /home/faircoin
ARG FAIRCOIN_CONF
ARG FAIRCOIN_PORT
-RUN ./faircoind -daemon -disablewallet -reindex -port=$FAIRCOIN_PORT -conf="$FAIRCOIN_CONF" && \
+RUN ./faircoind -daemon -disablewallet -reindex -port=$FAIRCOIN_PORT && \
sleep 60 && \
./faircoin-cli stop && \
sleep 10
diff --git a/docker-compose.yml b/docker-compose.yml
index 503e826..3481c11 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,11 +9,10 @@ services:
source_repository: "https://github.com/faircoin/faircoin.git"
GITLAB_RUNNER_UID: "${GITLAB_RUNNER_UID}"
GITLAB_RUNNER_GID: "${GITLAB_RUNNER_GID}"
- FAIRCOIN_CONF: "${FAIRCOIN_CONF}"
FAIRCOIN_PORT: 40414
container_name: FairCoin.Co-faircoind
restart: always
- command: '-disablewallet -conf="${FAIRCOIN_CONF}" -port=40414 -blocknotify="${CI_PROJECT_DIR}/blocknotify.sh"'
+ command: '-disablewallet -conf="${FAIRCOIN_CONF}" -port=40414'
# command: '-disablewallet -conf="${FAIRCOIN_CONF}" -blocknotify="${BLOCKNOTIFY}"'
network_mode: "host"
user: "${GITLAB_RUNNER_UID}:${GITLAB_RUNNER_GID}"
--
GitLab