From 8aabd3dd0dc73be20fc815661bb12d0388a9cd7f Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 23 Sep 2021 13:05:11 -0700 Subject: [PATCH] Update build images to python3 for compat with recent gsutil change Signed-off-by: Brad Davidson --- Dockerfile.dapper | 4 ++-- Dockerfile.test.dapper | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index e60428ddc1..a74ccd0d66 100644 --- 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 && \ diff --git a/Dockerfile.test.dapper b/Dockerfile.test.dapper index 437182803d..027904c6a7 100644 --- a/Dockerfile.test.dapper +++ b/Dockerfile.test.dapper @@ -1,7 +1,7 @@ -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