Skip to content

Commit

Permalink
eval then exec terminating commands in docker-entrypoint.sh
Browse files Browse the repository at this point in the history
Signed-off-by: Lachlan Roberts <[email protected]>
  • Loading branch information
lachlan-roberts committed Aug 15, 2023
1 parent 5a0f1eb commit bdc16a3
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
shift
# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
# the second one is used when generating the --dry-run output.
echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
. $JETTY_BASE/jetty.exec
eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"

This comment has been minimized.

Copy link
@butlnor

butlnor Aug 18, 2023

This change broke our build and deploy processes. Why was this change necessary?

This comment has been minimized.

Copy link
@gregw

gregw Aug 18, 2023

This change broke our build and deploy processes. Why was this change necessary?

@butlnor
This was a change requested by the review process in order to get the last release accepted as an official release.

Can you raise an issue and document what problems it has caused you?

This comment has been minimized.

Copy link
@butlnor

butlnor Aug 21, 2023

It broke the way how the values are escaped, when using backslashes.

This comment has been minimized.

Copy link
@joakime

joakime Aug 21, 2023

Contributor

@butlnor the review process @gregw mentioned, that caused this change, can be found at

docker-library/official-images#15161

That review is required for getting jetty-docker into hub.docker.com

This comment has been minimized.

Copy link
@lachlan-roberts

lachlan-roberts Aug 22, 2023

Author Contributor

@butlnor can you please coordinate on #153 to help get this fixed.

esac
done

Expand Down

0 comments on commit bdc16a3

Please sign in to comment.