From 4d25d75ff81b848ef2d34be300b9c60c94ff35cb Mon Sep 17 00:00:00 2001
From: TonyFord <tonyford@strategy-investor.de>
Date: Thu, 25 Jun 2020 14:24:31 +0200
Subject: [PATCH] ts
---
.gitlab-ci.yml | 5 ++---
Dockerfile | 11 +++++++++--
blocknotify.sh | 8 ++++++++
docker-compose.yml | 3 ++-
script/blocknotify.sh | 4 ----
5 files changed, 21 insertions(+), 10 deletions(-)
create mode 100644 blocknotify.sh
delete mode 100644 script/blocknotify.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f3e231..962a0cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,9 +16,8 @@ build-faircoind:
- $CMD =~ /build/
before_script:
- mkdir -p ~/.faircoin2
- - cp ${FAIRCOIN_CONF} ~/.faircoin2/faircoin.conf
-# - source ${FAIRCOIN_CONF}
-# - echo -e "rpcconnect=${rpcconnect}\nrpcport=${rpcport}\nrpcuser=${rpcuser}\nrpcpassword=${rpcpassword}\ntxindex=1" > ~/.faircoin2/faircoin.conf
+ - 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 a2fd3fc..bad580e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,10 +58,17 @@ 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
+# RUN chown -R faircoin:faircoin /home/faircoin/.faircoin2
+# RUN echo "TTT $FAIRCOIN_CONF" > /home/faircoin/.faircoin2/inf.conf
+
WORKDIR /home/faircoin
-RUN ./faircoind -daemon -disablewallet -port=40414 -reindex && \
+ARG FAIRCOIN_CONF
+ARG FAIRCOIN_PORT
+RUN ./faircoind -daemon -disablewallet -reindex -port=$FAIRCOIN_PORT && \
sleep 60 && \
./faircoin-cli stop && \
sleep 10
-ENTRYPOINT ["./faircoind","-daemon","-disablewallet","-port=40414"]
+ENTRYPOINT ["./faircoind"]
diff --git a/blocknotify.sh b/blocknotify.sh
new file mode 100644
index 0000000..8049b8e
--- /dev/null
+++ b/blocknotify.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+PATH="$1/.."
+
+if [ -e $PATH/pulse.faircoin.co/script/getdata.py ]
+then
+ cd $PATH/pulse.faircoin.co/script
+ python3 getdata.py
+fi
diff --git a/docker-compose.yml b/docker-compose.yml
index b8b2c2d..3481c11 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,9 +9,10 @@ services:
source_repository: "https://github.com/faircoin/faircoin.git"
GITLAB_RUNNER_UID: "${GITLAB_RUNNER_UID}"
GITLAB_RUNNER_GID: "${GITLAB_RUNNER_GID}"
+ FAIRCOIN_PORT: 40414
container_name: FairCoin.Co-faircoind
restart: always
-# command: '-disablewallet'
+ command: '-disablewallet -conf="${FAIRCOIN_CONF}" -port=40414'
# command: '-disablewallet -conf="${FAIRCOIN_CONF}" -blocknotify="${BLOCKNOTIFY}"'
network_mode: "host"
user: "${GITLAB_RUNNER_UID}:${GITLAB_RUNNER_GID}"
diff --git a/script/blocknotify.sh b/script/blocknotify.sh
deleted file mode 100644
index 0f693ef..0000000
--- a/script/blocknotify.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd ~/pulse.faircoin.co/script
-python3 getdata.py
--
GitLab