chore: hadolint fixes

Author: dervoeti

hadoop/Dockerfile

@@ -76,10 +76,10 @@ USER ${STACKABLE_USER_UID}
 RUN <<EOF
 cd "$(/stackable/patchable --images-repo-root=src checkout hadoop ${PRODUCT})"
 
-export ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-export NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+NEW_VERSION=${PRODUCT}-stackable${RELEASE}
 
-mvn versions:set -DnewVersion=$NEW_VERSION
+mvn versions:set -DnewVersion=${NEW_VERSION}
 
 # Since we skip building the hadoop-pipes module, we need to set the version to the original version so it can be pulled from Maven Central
 sed -e '/<artifactId>hadoop-pipes<\/artifactId>/,/<\/dependency>/ { s/<version>.*<\/version>/<version>'"$ORIGINAL_VERSION"'<\/version>/ }' -i hadoop-tools/hadoop-tools-dist/pom.xml
@@ -93,7 +93,7 @@ mvn \
     clean package install \
     -Pdist,native \
     -pl '!hadoop-tools/hadoop-pipes' \
-    -Dhadoop.version=$NEW_VERSION \
+    -Dhadoop.version=${NEW_VERSION} \
     -Drequire.fuse=true \
     -DskipTests \
     -Dmaven.javadoc.skip=true

spark-k8s/Dockerfile

@@ -22,7 +22,6 @@ COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/stackable/patches/${PRODUCT} /sta
 RUN <<EOF
 cd "$(/stackable/patchable --images-repo-root=src checkout spark-k8s ${PRODUCT})"
 
-ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
@@ -178,6 +177,7 @@ export MAVEN_OPTS="-Xss64m -Xmx2g -XX:ReservedCodeCacheSize=1g" \
     --batch-mode
 sed -i "s/${NEW_VERSION}/${ORIGINAL_VERSION}/g" assembly/target/bom.json
 EOF
+
 # <<< Build spark
 
 

trino/trino/Dockerfile

@@ -16,7 +16,6 @@ COPY --chown=${STACKABLE_USER_UID}:0 trino/trino/stackable/patches/${PRODUCT} /s
 RUN --mount=type=cache,id=maven-${PRODUCT},target=/root/.m2/repository <<EOF
 cd "$(/stackable/patchable --images-repo-root=src checkout trino/trino ${PRODUCT})"
 
-ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
@@ -74,4 +73,4 @@ ln -s /stackable/trino-server-${NEW_VERSION} /stackable/trino-server
 
 # Set correct permissions
 chmod --recursive g=u /stackable
-EOF
+EOF