diff --git a/docker/debug/Dockerfile b/docker/debug/Dockerfile
index 4cf972b8d42..748f5e5cbc5 100644
--- a/docker/debug/Dockerfile
+++ b/docker/debug/Dockerfile
@@ -3,7 +3,7 @@ ARG golang_image
 FROM $golang_image AS build
 ARG TARGETARCH
 ENV GOPATH /go
-RUN apk add --update --no-cache ca-certificates make git
+RUN apk add --update --no-cache ca-certificates make git build-base
 #Once go-delve adds support for s390x (see PR #2948), remove this entire conditional.
 #Once go-delve adds support for ppc64le (see PR go-delve/delve#1564), remove this entire conditional.
 RUN if [[ "$TARGETARCH" == "s390x"  ||  "$TARGETARCH" == "ppc64le" ]] ; then \
diff --git a/scripts/build-all-in-one-image.sh b/scripts/build-all-in-one-image.sh
index b82795451d7..c9f85d0b9d1 100755
--- a/scripts/build-all-in-one-image.sh
+++ b/scripts/build-all-in-one-image.sh
@@ -20,8 +20,6 @@ fi
 
 make build-ui
 
-set +e
-
 run_integration_test() {
   CID=$(docker run -d -p 16686:16686 -p 5778:5778 $1:latest)
   make all-in-one-integration-test