From 4e9b454d214d31531ffc05d0a4c87ac3d03e308b Mon Sep 17 00:00:00 2001
From: TonyFord <tonyford@strategy-investor.de>
Date: Thu, 25 Jun 2020 14:11:17 +0200
Subject: [PATCH] fweq
---
.gitlab-ci.yml | 5 +++--
Dockerfile | 11 +++++------
docker-compose.yml | 6 ++----
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab6bd82..8f3e231 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,8 @@ build-faircoind:
before_script:
- mkdir -p ~/.faircoin2
- cp ${FAIRCOIN_CONF} ~/.faircoin2/faircoin.conf
- - chmod +x ./script/blocknotify.sh
+# - 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
@@ -33,7 +34,7 @@ start-faircoind:
- $CMD =~ /build|start/
script:
- docker-compose down
- - docker-compose up
+ - docker-compose up -d
stop-faircoind:
stage: stop
diff --git a/Dockerfile b/Dockerfile
index d5f5af1..b5ee482 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,10 +59,9 @@ RUN mv ./faircoind /home/faircoin/faircoind
RUN mv ./faircoin-cli /home/faircoin/faircoin-cli
WORKDIR /home/faircoin
-# ARG FAIRCOIN_PORT
-# RUN ./faircoind -daemon -disablewallet -reindex -port=$FAIRCOIN_PORT && \
-# sleep 60 && \
-# ./faircoin-cli stop && \
-# sleep 10
+RUN ./faircoind -daemon -disablewallet -reindex && \
+ sleep 60 && \
+ ./faircoin-cli stop && \
+ sleep 10
-ENTRYPOINT ["./faircoind" ]
+ENTRYPOINT ["./faircoind","-daemon","-disablewallet"]
diff --git a/docker-compose.yml b/docker-compose.yml
index bbd5fa5..b8b2c2d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,13 +9,11 @@ services:
source_repository: "https://github.com/faircoin/faircoin.git"
GITLAB_RUNNER_UID: "${GITLAB_RUNNER_UID}"
GITLAB_RUNNER_GID: "${GITLAB_RUNNER_GID}"
- FAIRCOIN_PORT: ${FAIRCOIN_PORT}
container_name: FairCoin.Co-faircoind
restart: always
- command: '-daemon -disablewallet -port=${FAIRCOIN_PORT} -conf="/home/faircoin/.faircoin2/faircoin.conf" -blocknotify="/home/faircoin/script/blocknotify.sh"'
+# command: '-disablewallet'
+# command: '-disablewallet -conf="${FAIRCOIN_CONF}" -blocknotify="${BLOCKNOTIFY}"'
network_mode: "host"
user: "${GITLAB_RUNNER_UID}:${GITLAB_RUNNER_GID}"
volumes:
- ~/.faircoin2:/home/faircoin/.faircoin2
- - ./script:/home/faircoin/script
- - ${CI_PROJECT_DIR}/../pulse.faircoin.co:/home/faircoin/pulse.faircoin.co
--
GitLab