Node default directory for docker and correct public image tag (#3772)

wavesplatform · Oct 10, 2022 · 3570077 · 3570077
1 parent c78a513
commit 3570077
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/publish-docker-node.yaml b/.github/workflows/publish-docker-node.yaml
@@ -80,4 +80,4 @@ jobs:
           push: true
           tags: ${{ steps.meta-private.outputs.tags }}
           build-args: |
-            NODE_TAG=${{ github.event.release.tag_name }}
+            NODE_TAG=${{ steps.meta-public.outputs.version }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -4,14 +4,14 @@ ENV WAVES_LOG_LEVEL=INFO
 ENV WAVES_HEAP_SIZE=2g
 ENV WAVES_NETWORK=mainnet
 
-ENV YOURKIT_VERSION=2021.3
+ENV YOURKIT_VERSION=2022.9
 
 SHELL ["/bin/bash", "-c"]
 
 # Additional dependencies
 RUN apt-get update && apt-get install -y wget unzip gosu || exit 1; \
     export YOURKIT_ARCHIVE="YourKit-JavaProfiler-$YOURKIT_VERSION-docker.zip"; \
-    wget --quiet "https://www.yourkit.com/download/docker/$YOURKIT_ARCHIVE" -P /tmp/ && unzip /tmp/$YOURKIT_ARCHIVE -d /usr/local; \
+    wget --quiet "https://www.yourkit.com/download/docker/$YOURKIT_ARCHIVE" -P /tmp/ && unzip /tmp/$YOURKIT_ARCHIVE -d /usr/local || exit 1; \
     # Clean
     apt-get remove -y wget unzip && apt-get autoremove -y && apt-get autoclean && rm -rf /var/lib/apt/lists/*
 

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -5,7 +5,7 @@ logEcho() {
   echo $1 | gosu waves tee -a /var/log/waves/waves.log
 }
 [ -n "${YOURKIT_OPTS}" ] && JAVA_OPTS="$JAVA_OPTS -agentpath:/usr/local/YourKit-JavaProfiler-$YOURKIT_VERSION/bin/linux-x86-64/libyjpagent.so=$YOURKIT_OPTS"
-JAVA_OPTS="${JAVA_OPTS} -Dwaves.defaults.blockchain.type=$WAVES_NETWORK"
+JAVA_OPTS="${JAVA_OPTS} -Dwaves.defaults.blockchain.type=$WAVES_NETWORK -Dwaves.defaults.directory=$WVDATA"
 
 logEcho "Node is starting..."
 logEcho "WAVES_HEAP_SIZE='${WAVES_HEAP_SIZE}'"