Skip to content

Commit

Permalink
fix(debug): drop the --progress flag
Browse files Browse the repository at this point in the history
Newer docker engines do not support the flag anymore.
Fixes #399
  • Loading branch information
Tieske committed Oct 24, 2023
1 parent 64a0607 commit adedc51
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -838,6 +838,8 @@ The result should be a new PR on the Pongo repo.
* Fix: `pongo down` would not remove volumes. This
caused orphaned volumes on long running VMs as well as on personal
machines.
* Fix: drop the `--progress` flag from docker commands when building. Since
the flag isn't always available.

---

Expand Down
17 changes: 9 additions & 8 deletions pongo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ function parse_args {
args_done=1
;;
--debug)
PONGO_DEBUG=true
# PONGO_DEBUG=true
set -x
;;
*)
Expand Down Expand Up @@ -726,15 +726,16 @@ function build_image {
fi

msg "starting build of image '$KONG_TEST_IMAGE'"
local progress_type
if [[ "$PONGO_DEBUG" == "true" ]] ; then
progress_type=plain
else
progress_type=auto
fi
# local progress_type
# if [[ "$PONGO_DEBUG" == "true" ]] ; then
# progress_type=plain
# else
# progress_type=auto
# fi
# The following line caused issues on newer Docker releases, so we're disabling it for now
# --progress $progress_type \
$WINPTY_PREFIX docker build \
-f "$DOCKER_FILE" \
--progress $progress_type \
--build-arg PONGO_VERSION="$PONGO_VERSION" \
--build-arg http_proxy \
--build-arg https_proxy \
Expand Down

0 comments on commit adedc51

Please sign in to comment.