fix(install): Adds separate prox-args for podman build vs. podman-compose build; Substitutes occurences of

Author: Daniel Bunte

install/dc-detect-version.sh

@@ -37,10 +37,11 @@ else
   dc="$dc_base $NO_ANSI"
 fi
 
+proxy_args="--build-arg http_proxy=${http_proxy:-} --build-arg https_proxy=${https_proxy:-} --build-arg no_proxy=${no_proxy:-}"
 if [[ "$CONTAINER_ENGINE" == "docker" ]]; then
-  proxy_args="--build-arg http_proxy=${http_proxy:-} --build-arg https_proxy=${https_proxy:-} --build-arg no_proxy=${no_proxy:-}"
+  proxy_args_dc=$proxy_args
 elif [[ "$CONTAINER_ENGINE" == "podman" ]]; then
-  proxy_args="--podman-build-args http_proxy=${http_proxy:-},https_proxy=${https_proxy:-},no_proxy=${no_proxy:-}"
+  proxy_args_dc="--podman-build-args http_proxy=${http_proxy:-},https_proxy=${https_proxy:-},no_proxy=${no_proxy:-}"
 fi
 dcr="$dc run --pull=never --rm"
 dcb="$dc build $proxy_args"

install/error-handling.sh

@@ -27,7 +27,7 @@ send_event() {
   local breadcrumbs=$5
   local fingerprint_value=$(
     echo -n "$cmd_exit $error_msg $traceback" |
-      docker run -i --rm busybox md5sum |
+      $CONTAINER_ENGINE run -i --rm busybox md5sum |
       cut -d' ' -f1
   )
   local envelope_file="sentry-envelope-${fingerprint_value}"
@@ -151,7 +151,7 @@ fi
 
 # Make sure we can use sentry-cli if we need it.
 if [ "$REPORT_SELF_HOSTED_ISSUES" == 1 ]; then
-  if ! docker pull getsentry/sentry-cli:latest; then
+  if ! $CONTAINER_ENGINE pull getsentry/sentry-cli:latest; then
     echo "Failed to pull sentry-cli, won't report to Sentry after all."
     export REPORT_SELF_HOSTED_ISSUES=0
   fi