From fa34b6ae7d77082dd9709e792dc2c74160658df3 Mon Sep 17 00:00:00 2001
From: TonyFord <tonyford@strategy-investor.de>
Date: Thu, 25 Jun 2020 13:47:52 +0200
Subject: [PATCH] add blocknotify.sh
---
.gitlab-ci.yml | 3 +--
Dockerfile | 5 +++--
blocknotify.sh | 8 --------
docker-compose.yml | 6 ++++--
script/blocknotify.sh | 4 ++++
5 files changed, 12 insertions(+), 14 deletions(-)
delete mode 100644 blocknotify.sh
create mode 100644 script/blocknotify.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f3e231..4c5334a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,7 @@ build-faircoind:
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
+ - chmod +x ./script/blocknotify.sh
script:
- docker-compose down
- docker-compose build
diff --git a/Dockerfile b/Dockerfile
index b5ee482..23c9377 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,9 +59,10 @@ RUN mv ./faircoind /home/faircoin/faircoind
RUN mv ./faircoin-cli /home/faircoin/faircoin-cli
WORKDIR /home/faircoin
-RUN ./faircoind -daemon -disablewallet -reindex && \
+ARG FAIRCOIN_PORT
+RUN ./faircoind -daemon -disablewallet -reindex -port=$FAIRCOIN_PORT && \
sleep 60 && \
./faircoin-cli stop && \
sleep 10
-ENTRYPOINT ["./faircoind","-daemon","-disablewallet"]
+ENTRYPOINT ["./faircoind","-daemon","-disablewallet","-port=$FAIRCOIN_PORT" ]
diff --git a/blocknotify.sh b/blocknotify.sh
deleted file mode 100644
index 8049b8e..0000000
--- a/blocknotify.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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..19c7afe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,11 +9,13 @@ 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: '-disablewallet'
-# command: '-disablewallet -conf="${FAIRCOIN_CONF}" -blocknotify="${BLOCKNOTIFY}"'
+ command: '-blocknotify=/home/faircoin/script/blocknotify.sh'
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
diff --git a/script/blocknotify.sh b/script/blocknotify.sh
new file mode 100644
index 0000000..0f693ef
--- /dev/null
+++ b/script/blocknotify.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd ~/pulse.faircoin.co/script
+python3 getdata.py
--
GitLab