Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(debug): drop the --progress flag #449

Merged
merged 1 commit into from
Oct 24, 2023
Merged

fix(debug): drop the --progress flag #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
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
View file
Open in desktop
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