diff --git a/.circleci/config.yml b/.circleci/config.yml index 07cf6a69..12ca437a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,13 +22,9 @@ commands: command: mkdir -p ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config - run: - name: Clone and Build RSKj + name: Run RSKj command: | - GIT_SSH_COMMAND='ssh -i ~/.ssh/id_rsa_fingerprint' - git clone -b << pipeline.parameters.branch >> git@github.com:<< pipeline.parameters.repo >> ~/rsksmart/rskj - cd ~/rsksmart/rskj/ - ./configure.sh - ./gradlew clean build -x test + docker run -p 127.0.0.1:4444:4444 -p 127.0.0.1:4445:4445 --name enveloping-rskj -it -v $PWD/logback.xml:/etc/rsk/logback.xml -v $PWD/node.conf:/etc/rsk/node.conf rsksmart/rskj:IRIS-3 --regtest - restore_cache: # special step to restore the dependency cache key: dependency-cachev4-{{ checksum "package.json" }}-yarn2 diff --git a/rsknode/Dockerfile b/rsknode/Dockerfile deleted file mode 100644 index 3c22903e..00000000 --- a/rsknode/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM openjdk:8-jdk-slim-buster as build -RUN apt-get update -y && \ - apt-get install -y git curl gnupg && \ - rm -rf /var/lib/apt/lists/* && \ - apt-get autoremove -y && \ - apt-get clean - -RUN gpg --keyserver https://secchannel.rsk.co/release.asc --recv-keys 1A92D8942171AFA951A857365DECF4415E3B8FA4 -RUN gpg --finger 1A92D8942171AFA951A857365DECF4415E3B8FA4 - -ARG rskj_codename=SNAPSHOT -ARG rskj_version=3.2.0 -ARG working_branch=master - -RUN git clone --single-branch --depth 1 --branch "${working_branch}" https://github.com/rsksmart/rskj.git /code/rskj - -WORKDIR /code/rskj - -RUN gpg --verify SHA256SUMS.asc -RUN sha256sum --check SHA256SUMS.asc -RUN ./configure.sh -RUN ./gradlew --no-daemon clean build -x test - -FROM openjdk:8-jdk-slim-buster - -ARG rskj_codename=SNAPSHOT -ARG rskj_version=3.2.0 - -WORKDIR /usr/local/rskj -COPY --from=build /code/rskj/rskj-core/build/libs/rskj-core-${rskj_version}-${rskj_codename}-all.jar ./rsk.jar -COPY node.conf ./node.conf -COPY logback.xml ./logback.xml - -RUN mkdir -p /root/.rsk/regtest/database -RUN chmod -R 777 /root/.rsk - -ENTRYPOINT ["java", \ - "-Drsk.conf.file=./node.conf", \ - "-Dlogback.configurationFile=./logback.xml", \ - "-cp", "./rsk.jar", "co.rsk.Start" ] diff --git a/rsknode/README.md b/rsknode/README.md index 26172b1d..392e1718 100644 --- a/rsknode/README.md +++ b/rsknode/README.md @@ -1,28 +1,13 @@ -# Building +# Running -To build the default `PAPYRUS-2.1.0`, run in the `rsknode` folder: +To run the RSKj container please use the following command: -``` -docker build -t rskj:2.1.0-PAPYRUS . +```bash +docker run -p 127.0.0.1:4444:4444 -p 127.0.0.1:4445:4445 --name enveloping-rskj -it -v $PWD/logback.xml:/etc/rsk/logback.xml -v $PWD/node.conf:/etc/rsk/node.conf rsksmart/rskj:IRIS-3 --regtest ``` -To build a different version, say `LOREMIPSUM-42.0.0`, use instead +You could also use docker-compose: ``` -docker build \ - --build-arg rskj_version=42.0.0 \ - --build-arg rskj_codename=LOREMIPSUM \ - -t rskj:42.0.0-LOREMIPSUM . +docker-compose up -d ``` - -# Running - -To run, use the recently generated tag (`-t` parameter for `docker -build`): - -``` -docker run -p 127.0.0.1:4444:4444 --name enveloping-rskj rskj:2.1.0-PAPYRUS --regtest -``` - -`--regtest` can be modified to any other of the networks or parameters -supported by the rskj binary. diff --git a/rsknode/docker-compose.yml b/rsknode/docker-compose.yml index 0db4fb08..40784ec7 100644 --- a/rsknode/docker-compose.yml +++ b/rsknode/docker-compose.yml @@ -1,20 +1,17 @@ -version: "3" +version: '3' services: - rskj: - build: - context: "." - args: - - rskj_codename=SNAPSHOT - - rskj_version=3.0.0 - - working_branch=master - container_name: rsk-node - image: rskj:latest - command: --regtest - ports: - - "127.0.0.1:4444:4444" - networks: - - "enveloping-tests-net" + rskj: + container_name: rsk-node + image: rsksmart/rskj:IRIS-3 + ports: + - '127.0.0.1:4444:4444' + - '127.0.0.1:4445:4445' + networks: + - 'rif-relay-testing' + volumes: + - ./logback.xml:/etc/rsk/logback.xml + - ./node.conf:/etc/rsk/node.conf networks: - enveloping-tests-net: - external: true + rif-relay-testing: + external: true