Update build images to python3 for compat with recent gsutil change

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Update build images to python3 for compat with recent gsutil change
8aabd3dd · Brad Davidson · Brad Davidson · e698d6d8 · 8aabd3dd · 8aabd3dd
Commit 8aabd3dd authored Sep 23, 2021 by Brad Davidson Committed by Brad Davidson Oct 04, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Dockerfile.dapper Dockerfile.dapper +2 -2

Dockerfile.test.dapper Dockerfile.test.dapper +2 -2

No files found.
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -9,8 +9,8 @@ ENV https_proxy=$https_proxy
 ENV no_proxy=$no_proxy

 RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers zlib-dev tar zip squashfs-tools npm coreutils \
-    python2 openssl-dev libffi-dev libseccomp libseccomp-dev libseccomp-static make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev \
-    zlib-static
+    python3 openssl-dev libffi-dev libseccomp libseccomp-dev libseccomp-static make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev \
+    zlib-static zstd
 RUN if [ "$(go env GOARCH)" = "arm64" ]; then                                                               \
    wget https://github.com/aquasecurity/trivy/releases/download/v0.11.0/trivy_0.11.0_Linux-ARM64.tar.gz && \
    tar -zxvf trivy_0.11.0_Linux-ARM64.tar.gz                                                            && \

--- a/Dockerfile.test.dapper
+++ b/Dockerfile.test.dapper
-ARG GOLANG=golang:1.15.13-alpine3.13
+ARG GOLANG=golang:1.15.14-alpine3.13
 FROM ${GOLANG}

-RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python2 openssl
+RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python3 openssl py3-pip

 ENV SONOBUOY_VERSION 0.19.0