diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab6bd822b7f8dc32ecce94992085a8ea2caff925..8f3e2312b13d1d0cb8a16bd6539ab41ad69a3e68 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 d5f5af1132ad945c5e32dfc856f284951705ecd6..b5ee482a059a1fced818761b594fc93280da1345 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 bbd5fa56b6eccd274789b9c63ee91046cdf3e76d..b8b2c2d5f62ca930bd156eef4eea1038b37e516d 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