Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bazelbuild/rules_docker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c95f72d6d3f84370fde606db5625421e23ea552a
Choose a base ref
..
head repository: bazelbuild/rules_docker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aaab1e4f93e23106cdbf69cf83975750f676ba9d
Choose a head ref
Showing with 3 additions and 3 deletions.
  1. +1 −1 docker/util/commit.sh.tpl
  2. +1 −1 docker/util/commit_layer.sh.tpl
  3. +1 −1 docker/util/extract.sh.tpl
2 changes: 1 addition & 1 deletion docker/util/commit.sh.tpl
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ if ! (
# Actually wait for the container to finish running its commands
retcode=$($DOCKER $DOCKER_FLAGS wait $id)
# Trigger a failure if the run had a non-zero exit status
if [ $retcode != 0 ]; then
if [ "$retcode" != 0 ]; then
$DOCKER $DOCKER_FLAGS logs $id && false
fi
reset_parent_cmd %{parent_config} $id %{output_image}
2 changes: 1 addition & 1 deletion docker/util/commit_layer.sh.tpl
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ if ! (
# Actually wait for the container to finish running its commands
retcode=$($DOCKER $DOCKER_FLAGS wait $id)
# Trigger a failure if the run had a non-zero exit status
if [ $retcode != 0 ]; then
if [ "$retcode" != 0 ]; then
$DOCKER $DOCKER_FLAGS logs $id && false
fi
reset_parent_cmd %{parent_config} $id %{output_image}
2 changes: 1 addition & 1 deletion docker/util/extract.sh.tpl
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ if ! (


# Print any error that occurred in the container.
if [ $retcode != 0 ]; then
if [ "$retcode" != 0 ]; then
$DOCKER $DOCKER_FLAGS logs $id && false
exit $retcode
fi