diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a3424d7502c2fde5cf9f4ae031fc4e6447d99d2..0f7d06f823b2897173b86f0bbdb746dae543629d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,8 +18,6 @@ build-faircoind: - export RUNNER_UID=`id -u` - export RUNNER_GID=`id -g` - mkdir -p ~/.faircoin2 -# - 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 stop diff --git a/Dockerfile b/Dockerfile index 49265e64e2fb6be73a01c84ac4e4d5031139c151..6609c09bece2fbdcb9795bf06e586fec9a1ffe34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,6 +65,9 @@ RUN chown -R faircoin:faircoin /home/faircoin/pulse.faircoin.co RUN mkdir -p /home/faircoin/.faircoin2 RUN chown -R faircoin:faircoin /home/faircoin/.faircoin2 +RUN mkdir -p /home/faircoin/explorer.faircoin.co +RUN chown -R faircoin:faircoin /home/faircoin/explorer.faircoin.co + USER faircoin WORKDIR /home/faircoin ENTRYPOINT ["./faircoind"] diff --git a/docker-compose.yml b/docker-compose.yml index 8ffb249d7ab2b81d4f2dbad58d02c50c64b275f9..8f77371d46b47c8c8e7096140ee4bbe25388c7e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,3 +21,4 @@ services: - ~/.faircoin2:/home/faircoin/.faircoin2 - ./script:/home/faircoin/script - ../pulse.faircoin.co:/home/faircoin/pulse.faircoin.co + - ../explorer.faircoin.co:/home/faircoin/explorer.faircoin.co diff --git a/script/blocknotify.sh b/script/blocknotify.sh index bc20ceb241e6a6ce266ed7710bb304f6fd1279c9..ef57425e343ce721262c759559af48763c0d0cb2 100644 --- a/script/blocknotify.sh +++ b/script/blocknotify.sh @@ -1,2 +1,7 @@ #!/bin/bash + + python3 /home/faircoin/pulse.faircoin.co/script/getdata.py + +cd /home/faircoin/explorer.faircoin.co +docker-compose exec -T app dbload.py