From a4d2f4f020508a3ca5cb45806d9790851edb0242 Mon Sep 17 00:00:00 2001
From: TonyFord <tonyford@strategy-investor.de>
Date: Thu, 25 Jun 2020 14:55:27 +0200
Subject: [PATCH] changes
---
.gitlab-ci.yml | 3 +--
Dockerfile | 10 ----------
docker-compose.yml | 1 -
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c73de4b..1f4a353 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ start-faircoind:
- $CMD =~ /build|start/
script:
- docker-compose down
- - docker-compose up
+ - docker-compose up -d
stop-faircoind:
stage: stop
@@ -71,5 +71,4 @@ remove-faircoind:
script:
- docker-compose down
after_script:
- - echo ${CI_PROJECT_DIR} > ~/test.txt
- rm -R ~/.faircoin2
diff --git a/Dockerfile b/Dockerfile
index c3fe730..705d804 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,18 +58,8 @@ WORKDIR /home/faircoin/faircoin/src
RUN mv ./faircoind /home/faircoin/faircoind
RUN mv ./faircoin-cli /home/faircoin/faircoin-cli
-
-#RUN mkdir -p /home/faircoin/.faircoin2
-# VOLUME ['/home/faircoin/.faircoin2']
-#RUN chown -R faircoin:faircoin /home/faircoin/.faircoin2
-#RUN echo "TTT" > /home/faircoin/.faircoin2/inf.conf
-
WORKDIR /home/faircoin
ARG FAIRCOIN_CONF
ARG FAIRCOIN_PORT
-# RUN ./faircoind -daemon -disablewallet -reindex -port=$FAIRCOIN_PORT && \
-# sleep 60 && \
-# ./faircoin-cli stop && \
-# sleep 10
ENTRYPOINT ["./faircoind","-conf=.faircoin2/faircoin.conf"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 8ae7185..47edf29 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,6 @@ services:
container_name: FairCoin.Co-faircoind
restart: always
command: '-disablewallet -port=${FAIRCOIN_PORT}'
-# command: '-disablewallet -conf="${FAIRCOIN_CONF}" -blocknotify="${BLOCKNOTIFY}"'
network_mode: "host"
user: "${GITLAB_RUNNER_UID}:${GITLAB_RUNNER_GID}"
volumes:
--
GitLab