diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c73de4b9f7c2b5e20dd4b0dfbc386ca014a16fdb..1f4a353d000f190345c8d95de0f5db733723347e 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 c3fe730d315c4e92f9f8d59ce448181571aa25e3..705d80470a200158f83a94a76e651fe19032b6c6 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 8ae71857de790244262ebc9465c611b52b2944a8..47edf29164772834b4bf2d6536668f598e648e4d 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: