feat: changed container work dir from app to opt (#872)

Signed-off-by: Alex Kehayov <aleks.kehayov@limechain.tech>

Author: AlexKehayov

block-node/app/docker/Dockerfile

@@ -14,6 +14,9 @@ ARG SOURCE_DATE_EPOCH="0"
 FROM ubuntu:${UBUNTU_TAG} AS ubuntu-origin
 # Define Build Arguments
 ARG SOURCE_DATE_EPOCH
+ARG UID=2000
+ARG GID=2000
+ARG BN_WORKDIR="/opt/hiero/block-node"
 
 # Define Standard Environment Variables
 ENV DEBIAN_FRONTEND=noninteractive
@@ -64,14 +67,14 @@ RUN set -eux; \
     rm -f /tmp/openjdk.tar.gz /usr/local/java/lib/src.zip;
 
 
-RUN groupadd --gid 2000 hedera && \
-    useradd --no-user-group --create-home --uid 2000 --gid 2000 --shell /bin/bash hedera
+RUN groupadd --gid ${GID} hedera && \
+    useradd --no-user-group --create-home --uid ${UID} --gid ${GID} --shell /bin/bash hedera
 
 # Define version
 ARG VERSION
 
 # Set the working directory inside the container
-WORKDIR /app
+WORKDIR ${BN_WORKDIR}
 
 # Copy Distribution TAR file
 # Ignore Codacy, the `distributions` context is set on command line and
@@ -82,15 +85,15 @@ COPY --from=distributions block-node-app-${VERSION}.tar .
 RUN tar -xvf block-node-app-${VERSION}.tar
 
 # Create a log directory
-RUN mkdir -p /app/logs/config
+RUN mkdir -p ${BN_WORKDIR}/logs/config
 
 # Copy the logging properties file
-COPY logging.properties /app/logs/config/logging.properties
+COPY logging.properties ${BN_WORKDIR}/logs/config/logging.properties
 
 WORKDIR /
 
 # Ensure proper file permissions
-RUN chown -R 2000:2000 /app /opt
+RUN chown -R $UID:$GID ${BN_WORKDIR}
 
 ########################################
 ####    Deterministic Build Hack    ####
@@ -130,6 +133,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV JAVA_VERSION="jdk-21.0.7+6"
 ENV JAVA_HOME=/usr/local/java
 ENV PATH=${JAVA_HOME}/bin:${PATH}
+ENV BN_WORKDIR=/opt/hiero/block-node
 
 # Install Java
 COPY --from=java-builder ${JAVA_HOME}/ ${JAVA_HOME}/
@@ -138,12 +142,12 @@ COPY --from=java-builder ${JAVA_HOME}/ ${JAVA_HOME}/
 EXPOSE 8080/tcp
 
 USER hedera
-WORKDIR /app
+WORKDIR ${BN_WORKDIR}
 
 # HEALTHCHECK for liveness and readiness
 HEALTHCHECK --interval=30s --timeout=10s --start-period=3s --retries=3 \
   CMD curl -f http://localhost:8080/healthz/livez || exit 1 && \
       curl -f http://localhost:8080/healthz/readyz || exit 1
 
-# RUN the bin script for starting the server app
-ENTRYPOINT ["/bin/bash", "-c", "/app/block-node-app-${VERSION}/bin/block-node-app"]
+# RUN the bin script for starting the server
+ENTRYPOINT ["/bin/bash", "-c", "${BN_WORKDIR}/block-node-app-${VERSION}/bin/block-node-app"]

block-node/app/docker/docker-compose.yml

@@ -3,7 +3,7 @@ services:
     container_name: block-node-server
     image: block-node-server:${VERSION}
     volumes:
-      - ./logging.properties:/app/logs/config/logging.properties
+      - ./logging.properties:/opt/hiero/block-node/logs/config/logging.properties
     env_file:
       - .env
     ports:

block-node/app/docker/logging.properties

@@ -63,7 +63,7 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 # FileHandler properties
 ################################################################################
 # The pattern for the output file name.
-java.util.logging.FileHandler.pattern = /app/logs/blocknode-%g.log
+java.util.logging.FileHandler.pattern = /opt/hiero/block-node/logs/blocknode-%g.log
 # Set append to true if you want to keep appending to existing files
 java.util.logging.FileHandler.append = true
 # The limit in bytes before a new file is started.

block-node/app/docker/update-env.sh

@@ -18,7 +18,7 @@ project_version=$1
 echo "VERSION=$project_version" > .env
 echo "REGISTRY_PREFIX=" >> .env
 # Storage root path, this is temporary until we have a proper .properties file for all configs
-echo "BLOCKNODE_STORAGE_ROOT_PATH=/app/storage" >> .env
+echo "BLOCKNODE_STORAGE_ROOT_PATH=/opt/hiero/block-node/storage" >> .env
 
 if [ true = "$is_smoke_test" ]; then
   # add smoke test variables
@@ -33,11 +33,11 @@ fi
 if [ true = "$is_debug" ]; then
   # The server will wait for the debugger to attach on port 5005
   # JProfiler can attach on port 8849
-  echo "JAVA_TOOL_OPTIONS='-Djava.util.logging.config.file=/app/logs/config/logging.properties -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005' -agentpath:/path/to/libjprofilerti.so=port=8849 " >> .env
+  echo "JAVA_TOOL_OPTIONS='-Djava.util.logging.config.file=/opt/hiero/block-node/logs/config/logging.properties -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005' -agentpath:/path/to/libjprofilerti.so=port=8849 " >> .env
 else
   # we set normally the JAVA_TOOL_OPTIONS
   # file is mounted in the docker-compose.yml, changes to the file will be reflected in the container by simply restarting it
-  echo "JAVA_TOOL_OPTIONS='-Djava.util.logging.config.file=/app/logs/config/logging.properties '" >> .env
+  echo "JAVA_TOOL_OPTIONS='-Djava.util.logging.config.file=/opt/hiero/block-node/logs/config/logging.properties '" >> .env
 fi
 # Output the values
 echo ".env properties:"

block-node/block-providers/files.historic/src/main/java/org/hiero/block/node/blocks/files/historic/FilesHistoricConfig.java

@@ -24,7 +24,7 @@
  */
 @ConfigData("files.historic")
 public record FilesHistoricConfig(
-        @Loggable @ConfigProperty(defaultValue = "/opt/hashgraph/blocknode/data/historic") Path rootPath,
+        @Loggable @ConfigProperty(defaultValue = "/opt/hiero/block-node/data/historic") Path rootPath,
         @Loggable @ConfigProperty(defaultValue = "ZSTD") CompressionType compression,
         @Loggable @ConfigProperty(defaultValue = "4") @Min(1) @Max(6) int powersOfTenPerZipFileContents) {
     /**

block-node/block-providers/files.historic/src/test/java/org/hiero/block/node/blocks/files/historic/FilesHistoricConfigTest.java

@@ -39,7 +39,7 @@ class FilesHistoricConfigTest {
     @BeforeEach
     void setup() {
         jimfs = Jimfs.newFileSystem(Configuration.unix());
-        defaultRootPath = jimfs.getPath("/opt/hashgraph/blocknode/data/historic");
+        defaultRootPath = jimfs.getPath("/opt/hiero/block-node/data/historic");
         defaultCompression = CompressionType.ZSTD;
         powersOfTenPerZipFileContents = 4;
     }

block-node/block-providers/files.recent/src/main/java/org/hiero/block/node/blocks/files/recent/FilesRecentConfig.java

@@ -20,7 +20,7 @@
  */
 @ConfigData("files.recent")
 public record FilesRecentConfig(
-        @Loggable @ConfigProperty(defaultValue = "/opt/hashgraph/blocknode/data/live") Path liveRootPath,
+        @Loggable @ConfigProperty(defaultValue = "/opt/hiero/block-node/data/live") Path liveRootPath,
         @Loggable @ConfigProperty(defaultValue = "ZSTD") CompressionType compression,
         @Loggable @ConfigProperty(defaultValue = "3") int maxFilesPerDir) {
     /**

charts/block-node-server/README.md

@@ -65,14 +65,15 @@ There are several ways to configure the Hiero Block Node. The following is the m
 1. Create an override values file, `values.yaml`:
 2. Add the necessary environment configuration variables to the following section:
 
-   ```yaml
-   blockNode:
-     config:
-       # Add any additional env configuration here
-       # key: value
-       BLOCKNODE_STORAGE_ROOT_PATH: "/app/storage"
+```yaml
+blockNode:
+  config:
+    # Add any additional env configuration here
+    # key: value
+    BLOCKNODE_STORAGE_ROOT_PATH: "/opt/hiero/block-node/storage"
+
+```
 
-   ```
 3. Secrets should be set at the following structure:
 
    ```yaml

charts/block-node-server/templates/deployment.yaml

@@ -33,6 +33,9 @@ spec:
         - name: logging-config
           configMap:
             name: {{ include "hiero-block-node.fullname" . }}-logging-config
+        - name: logging-storage
+          persistentVolumeClaim:
+            claimName: {{ if .Values.blockNode.persistence.logging.create }}{{ include "hiero-block-node.fullname" . }}-logging{{ else }}{{ .Values.blockNode.persistence.logging.existingClaim }}{{ end }}
         - name: archive-storage
           persistentVolumeClaim:
             claimName: {{ if .Values.blockNode.persistence.archive.create }}{{ include "hiero-block-node.fullname" . }}-archive{{ else }}{{ .Values.blockNode.persistence.archive.existingClaim }}{{ end }}
@@ -53,12 +56,17 @@ spec:
               chmod 700 /live-pvc/{{ .Values.blockNode.persistence.live.subPath }} && \
               mkdir -p /archive-pvc/{{ .Values.blockNode.persistence.archive.subPath }} && \
               chown 2000:2000 /archive-pvc/{{ .Values.blockNode.persistence.archive.subPath }} && \
-              chmod 700 /archive-pvc/{{ .Values.blockNode.persistence.archive.subPath }}
+              chmod 700 /archive-pvc/{{ .Values.blockNode.persistence.archive.subPath }} && \
+              mkdir -p /logging-pvc/{{ .Values.blockNode.persistence.logging.subPath }} && \
+              chown 2000:2000 /logging-pvc/{{ .Values.blockNode.persistence.logging.subPath }} && \
+              chmod 700 /logging-pvc/{{ .Values.blockNode.persistence.logging.subPath }}
           volumeMounts:
             - name: live-storage
               mountPath: /live-pvc
             - name: archive-storage
               mountPath: /archive-pvc
+            - name: logging-storage
+              mountPath: /logging-pvc
       containers:
       - name: {{ .Chart.Name }}
         securityContext:
@@ -79,8 +87,10 @@ spec:
               name: {{ include "hiero-block-node.fullname" . }}-secret
         volumeMounts:
           - name: logging-config
-            mountPath: /app/logs/config
+            mountPath: {{ .Values.blockNode.logs.configMountPath }}
             readOnly: true
+          - name: logging-storage
+            mountPath: {{ .Values.blockNode.persistence.logging.mountPath }}
           - name: archive-storage
             mountPath: {{ .Values.blockNode.persistence.archive.mountPath }}
             subPath: {{ .Values.blockNode.persistence.archive.subPath }}

charts/block-node-server/templates/pvc-logging.yaml

@@ -0,0 +1,17 @@
+ {{- if .Values.blockNode.persistence.logging.create }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "hiero-block-node.fullname" . }}-logging
+  labels:
+    {{- include "hiero-block-node.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.blockNode.persistence.logging.size }}
+  {{- if .Values.blockNode.persistence.logging.storageClass }}
+  storageClassName: {{ .Values.blockNode.persistence.logging.storageClass }}
+  {{- end }}
+{{- end }}

charts/block-node-server/values-overrides/mini.yaml

@@ -11,14 +11,15 @@ resources:
 
 blockNode:
   config:
-    JAVA_TOOL_OPTIONS: "-Djava.util.logging.config.file=/app/logs/config/logging.properties"
     JAVA_OPTS: "-Xms5G -Xmx5G"
     MEDIATOR_RING_BUFFER_SIZE: "2048"
   persistence:
     archive:
       size: 6Gi
     live:
       size: 1Gi
+    logging:
+      size: 1Gi
 
 # Setting the PVC size for the Observability stack to mini claims of 1 Gigabyte
 kubepromstack:

charts/block-node-server/values.yaml

@@ -73,7 +73,7 @@ blockNode:
   config:
     # Add any additional env configuration here
     # key: value
-    JAVA_TOOL_OPTIONS: "-Djava.util.logging.config.file=/app/logs/config/logging.properties"
+    JAVA_TOOL_OPTIONS: "-Djava.util.logging.config.file=/opt/hiero/block-node/logs/config/logging.properties"
     JAVA_OPTS: "-Xms16G -Xmx16G"
     # PRODUCER_TYPE: "NO_OP"
     # PERSISTENCE_STORAGE_TYPE: "NO_OP"
@@ -90,10 +90,22 @@ blockNode:
       subPath: "archive-data"
       # If create is true, the following values are used to create the PVC
       # should match PERSISTENCE_STORAGE_ARCHIVE_ROOT_PATH, leave as is for default.
-      mountPath: "/opt/hashgraph/blocknode/data/historic"
+      mountPath: "/opt/hiero/block-node/data/historic"
       size: 800Gi
       # Optionally add a storage class name if needed
       # storageClass: "your-storage-class"
+    logging:
+      # If false, the chart expects an externally provided PVC
+      create: true
+      # Name of the externally provided PVC
+      existingClaim: ""
+      # Name of the subPath in the PVC to mount to mountPath in the container
+      subPath: "logging-data"
+      # If create is true, the following values are used to create the PVC
+      mountPath: "/opt/hiero/block-node/logs"
+      size: 2Gi
+      # Optionally add a storage class name if needed
+      # storageClass: "your-storage-class"
     live:
       # If false, the chart expects an externally provided PVC
       create: true
@@ -103,15 +115,15 @@ blockNode:
       subPath: "live-data"
       # If create is true, the following values are used to create the PVC
       # should match PERSISTENCE_STORAGE_LIVE_ROOT_PATH, leave as is for default.
-      mountPath: "/opt/hashgraph/blocknode/data/live"
+      mountPath: "/opt/hiero/block-node/data/live"
       size: 20Gi
       # Optionally add a storage class name if needed
       # storageClass: "your-storage-class"
     unverified:
       # unverified does a hard-coded emptyDir and is ephemeral, however needs to be mounted
       # this does not create a PVC.
       # should match PERSISTENCE_STORAGE_UNVERIFIED_ROOT_PATH, leave as is for default.
-      mountPath: "/opt/hashgraph/blocknode/data/unverified"
+      mountPath: "/opt/hiero/block-node/data/unverified"
   secret:
     PRIVATE_KEY: "fake_private_key"
   health:
@@ -125,6 +137,7 @@ blockNode:
     # Available Levels are (from most verbose to least verbose):
     # ALL FINEST FINER FINE CONFIG INFO WARNING SEVERE OFF
     level: "INFO"
+    configMountPath: "/opt/hiero/block-node/logs/config"
     loggingProperties:
       # com.hedera.block.server.producer.ProducerBlockItemObserver.level: "FINE"
       io.helidon.webserver.level: "INFO"
@@ -135,7 +148,7 @@ blockNode:
       handlers: "java.util.logging.ConsoleHandler, java.util.logging.FileHandler"
       java.util.logging.ConsoleHandler.level: "FINE"
       java.util.logging.ConsoleHandler.formatter: "java.util.logging.SimpleFormatter"
-      java.util.logging.FileHandler.pattern: "/app/logs/blocknode-%g.log"
+      java.util.logging.FileHandler.pattern: "/opt/hiero/block-node/logs/blocknode-%g.log"
       java.util.logging.FileHandler.append: "true"
       java.util.logging.FileHandler.limit: "5_000_000"
       java.util.logging.FileHandler.count: "5"

simulator/docker/Dockerfile

@@ -4,28 +4,29 @@ FROM eclipse-temurin:21
 ARG UNAME=hedera
 ARG UID=2000
 ARG GID=2000
+ARG BN_WORKDIR="/opt/hiero/block-node"
 RUN groupadd --gid $GID $UNAME
 RUN useradd --no-user-group --create-home --uid $UID --gid $GID --shell /bin/bash hedera
-WORKDIR /app
+WORKDIR ${BN_WORKDIR}
 
 # Copy the distribution and resources
 COPY simulator-*.tar ./simulator.tar
 
-RUN mkdir -p /app/logs/config
-COPY logging.properties /app/logs/config/logging.properties
+RUN mkdir -p ${BN_WORKDIR}/logs/config
+COPY logging.properties ${BN_WORKDIR}/logs/config/logging.properties
 
 # Extract the distribution and block data
 RUN tar -xf simulator.tar && \
     rm simulator.tar && \
-    cd /app && \
-    chown -R $UID:$GID /app
+    cd ${BN_WORKDIR} && \
+    chown -R $UID:$GID ${BN_WORKDIR}
 
 # Switch to non-root user
 USER $UNAME
 
 # Run the simulator using the extracted directory name
 RUN SIMULATOR_DIR=$(ls -d simulator-*/) && \
-    echo "#!/bin/bash\n/app/${SIMULATOR_DIR}bin/simulator" > /app/start.sh && \
-    chmod +x /app/start.sh
+    echo "#!/bin/bash\n${BN_WORKDIR}/${SIMULATOR_DIR}bin/simulator" > ${BN_WORKDIR}/start.sh && \
+    chmod +x ${BN_WORKDIR}/start.sh
 
-ENTRYPOINT ["/app/start.sh"]
+ENTRYPOINT ["${BN_WORKDIR}/start.sh"]

simulator/docker/update-env.sh

@@ -19,7 +19,7 @@ CONSUMER_BLOCK_STREAM_SIMULATOR_MODE=CONSUMER
 CONSUMER_PROMETHEUS_ENDPOINT_PORT_NUMBER=9997
 EOL
 
-logging_config_file_arg="-Djava.util.logging.config.file=/app/logs/config/logging.properties"
+logging_config_file_arg="-Djava.util.logging.config.file=/opt/hiero/block-node/logs/config/logging.properties"
 debug_arg="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5006"
 # determine if we should include debug opts
 [ "$1" = true ] && is_debug=true || is_debug=false

simulator/src/main/resources/logging.properties

@@ -36,7 +36,7 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 # FileHandler properties
 ################################################################################
 # The pattern for the output file name.
-java.util.logging.FileHandler.pattern = /app/logs/blocknode-%g.log
+java.util.logging.FileHandler.pattern = /opt/hiero/block-node/logs/blocknode-%g.log
 # Set append to true if you want to keep appending to existing files
 java.util.logging.FileHandler.append = true
 # The limit in bytes before a new file is started.

suites/src/main/java/org/hiero/block/suites/persistence/positive/PositiveDataPersistenceTests.java

@@ -23,7 +23,7 @@
 @DisplayName("Positive Data Persistence Tests")
 public class PositiveDataPersistenceTests extends BaseSuite {
     private final String[] GET_BLOCKS_COMMAND =
-            new String[] {"find", "../opt/hashgraph/blocknode/data/live", "-mindepth", "5", "-maxdepth", "7"};
+            new String[] {"find", "/opt/hiero/block-node/data/live", "-mindepth", "5", "-maxdepth", "7"};
 
     private Future<?> simulatorThread;