diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f3e2312b13d1d0cb8a16bd6539ab41ad69a3e68..4c5334a500fefd98c1420be8884d1e0fa61d7c8b 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 b5ee482a059a1fced818761b594fc93280da1345..23c93771f95195e921c3daa94da29310610419dd 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 8049b8e862de79b8d222174184f1f6143b9593dc..0000000000000000000000000000000000000000 --- 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 b8b2c2d5f62ca930bd156eef4eea1038b37e516d..19c7afe5bab64ef189f8e560c6f50e0c0ced5286 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 0000000000000000000000000000000000000000..0f693ef881004623d04b1c2c8a15e87594a6d54d --- /dev/null +++ b/script/blocknotify.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +cd ~/pulse.faircoin.co/script +python3 getdata.py