Dockerfile

@@ -1,6 +1,5 @@
 FROM debian:stable-slim
 RUN apt-get update && apt-get install -y \
-        binutils \
         curl \
         file \
         unzip \

warp4j

@@ -682,14 +682,18 @@ function create_optimized_runtime() {
     local platform=$1
     local machine=$2
     local jmods=$JAVA_DOWNLOAD_PATH/$platform/$machine/$CONCRETE_JAVA_VERSION/$UNPACKED_SUBDIR/jmods
+    local strip_debug=strip-debug
     echo "Creating minimal runtime for $platform..."
+    if [[ $JAVA_VERSION_BASE -ge 13 ]]; then
+        strip_debug=strip-java-debug-attributes
+    fi
     "$JLINK" \
         --no-header-files \
         --no-man-pages \
-        --strip-debug \
+        --$strip_debug \
         --module-path "$jmods" \
         --add-modules $MODULES \
-        --output "$BUNDLES_PATH/$platform/$machine/$BUNDLED_DISTRO_SUBDIR"
+        --output "$BUNDLES_PATH/$platform/$BUNDLED_DISTRO_SUBDIR"
     fail_if $? "Failed to optimize runtime"
 }
 
@@ -706,7 +710,7 @@ function create_bundle() {
 
     case $JAVA_DISTRO_TYPE in
         $DISTRO_TYPE_JDK)
-            create_optimized_runtime $platform
+            create_optimized_runtime $platform $machine
         ;;
         $DISTRO_TYPE_JRE)
             mkdir -p "$BUNDLES_PATH/$platform/$machine/$BUNDLED_DISTRO_SUBDIR"
@@ -727,7 +731,7 @@ function create_bundle() {
 rm -rf "$BUNDLES_PATH"
 # actually create bundles for all targets
 for target in ${TARGETS[@]}; do
-    create_bundle $target
+    create_bundle $target $X64
 done
 
 # creates binaries and archives for all targets
@@ -742,7 +746,7 @@ function warp_targets() {
             --input_dir "$BUNDLES_PATH/$LIN" \
             --exec "$LAUNCHER_NAME.sh" \
             --output "$WARPED_TEMP_PATH/$LIN/$APP_NAME" \
-            >&2
+            &> /dev/null
         fail_if $? "Failed to warp for $LIN"
         echo "Archiving for $LIN..."
         tar -C "$WARPED_TEMP_PATH/$LIN" -czf "$WARPED_TEMP_PATH/$APP_NAME-$LIN-x64.tar.gz" "$APP_NAME"
@@ -760,7 +764,7 @@ function warp_targets() {
             --input_dir "$BUNDLES_PATH/$MAC" \
             --exec "$LAUNCHER_NAME.sh" \
             --output "$WARPED_TEMP_PATH/$MAC/$APP_NAME" \
-            >&2
+            &> /dev/null
         fail_if $? "Failed to warp for $MAC"
         echo "Archiving for $MAC..."
         tar -C "$WARPED_TEMP_PATH/$MAC" -czf "$WARPED_TEMP_PATH/$APP_NAME-$MAC-x64.tar.gz" "$APP_NAME"
@@ -778,7 +782,7 @@ function warp_targets() {
             --input_dir "$BUNDLES_PATH/$WIN" \
             --exec "$LAUNCHER_NAME.cmd" \
             --output "$WARPED_TEMP_PATH/$WIN/$APP_NAME.exe" \
-            >&2
+            &> /dev/null
         fail_if $? "Failed to warp for $WIN"
         if command -v zip &> /dev/null ; then (
             echo "Archiving for $WIN..."