merge: #8585

8585: [Backport stable/1.3] fix: set default encoding to UTF-8 r=oleschoenburg a=github-actions[bot] # Description Backport of #8580 to `stable/1.3`. relates to #8579 Co-authored-by: Ole Schönburg <[email protected]>
camunda · Jan 13, 2022 · dd9ddc9 · dd9ddc9
2 parents 9f6c33e + 81be537
commit dd9ddc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,25 +21,10 @@ RUN chmod +x -R ${TMP_DIR}/bin/
 RUN chmod 0775 ${TMP_DIR} ${TMP_DIR}/data
 
 # Building prod image
-FROM eclipse-temurin:17 as jre-build
-
-# Create a custom Java runtime
-RUN $JAVA_HOME/bin/jlink \
-   --add-modules ALL-MODULE-PATH \
-   --strip-debug \
-   --no-man-pages \
-   --no-header-files \
-   --compress=2 \
-   --output jre17-with-all-modules
-
-# Define your base image
-FROM ubuntu:focal as prod
-ENV JAVA_HOME=/opt/java/openjdk
-ENV PATH "${JAVA_HOME}/bin:${PATH}"
-COPY --from=jre-build /jre17-with-all-modules $JAVA_HOME
+FROM eclipse-temurin:17-jre-focal as prod
 
 # Building dev image
-FROM eclipse-temurin:17 as dev
+FROM eclipse-temurin:17-jdk-focal as dev
 RUN echo "running DEV pre-install commands"
 RUN apt-get update
 RUN curl -sSL https://github.com/jvm-profiling-tools/async-profiler/releases/download/v1.7.1/async-profiler-1.7.1-linux-x64.tar.gz | tar xzv

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -217,7 +217,8 @@
           <copyConfigurationDirectory>true</copyConfigurationDirectory>
           <extraJvmArguments>-Xms128m
             --illegal-access=deny
-            -XX:+ExitOnOutOfMemoryError</extraJvmArguments>
+            -XX:+ExitOnOutOfMemoryError
+            -Dfile.encoding=UTF-8</extraJvmArguments>
           <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
           <platforms>
             <platform>windows</platform>
@@ -244,7 +245,7 @@
               <goal>assemble</goal>
             </goals>
             <phase>package</phase>
-            <configuration />
+            <configuration></configuration>
           </execution>
         </executions>
       </plugin>