Merge pull request vromero#102 from abedwardsw/feature/startupdup

fix duplicate java memory args on restart
spring-financial-group · Nov 1, 2018 · a83a382 · a83a382
2 parents 51cc419 + 3ef81d4
commit a83a382
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/assets/docker-entrypoint.sh b/src/assets/docker-entrypoint.sh
@@ -59,12 +59,12 @@ fi
 
 # Update min memory if the argument is passed
 if [ "$ARTEMIS_MIN_MEMORY" ]; then
-  sed -i "s/^JAVA_ARGS=\"/JAVA_ARGS=\"-Xms$ARTEMIS_MIN_MEMORY /g" $CONFIG_PATH/artemis.profile
+  sed -i "/-Xms/!s/^JAVA_ARGS=\"/JAVA_ARGS=\"-Xms$ARTEMIS_MIN_MEMORY /g" $CONFIG_PATH/artemis.profile
 fi
 
 # Update max memory if the argument is passed
 if [ "$ARTEMIS_MAX_MEMORY" ]; then
-  sed -i "s/^JAVA_ARGS=\"/JAVA_ARGS=\"-Xmx$ARTEMIS_MAX_MEMORY /g" $CONFIG_PATH/artemis.profile
+  sed -i "/-Xmx/!s/^JAVA_ARGS=\"/JAVA_ARGS=\"-Xmx$ARTEMIS_MAX_MEMORY /g" $CONFIG_PATH/artemis.profile
 fi
 
 # Support extra java opts from JAVA_OPTS env