From 0b4ed24e27b794e9cbda4f8d8069b4303f4658db Mon Sep 17 00:00:00 2001 From: Carlos Amedee Date: Wed, 7 Dec 2022 11:49:09 -0500 Subject: [PATCH] env/linux-arm64-bullseye: remove gpg from container images The tests which require gpg and gpg-agent have been removed. This change removes them from the container images. For golang/go#57034 Change-Id: Id33dbc9881bb9a688955612a66f1f549822f3866 Reviewed-on: https://go-review.googlesource.com/c/build/+/455860 Reviewed-by: Bryan Mills Reviewed-by: Cherry Mui Run-TryBot: Carlos Amedee TryBot-Result: Gopher Robot Reviewed-by: Dmitri Shuralyov --- env/linux-arm64-bullseye/Dockerfile | 3 --- env/linux-x86-bullseye/Dockerfile | 3 --- 2 files changed, 6 deletions(-) diff --git a/env/linux-arm64-bullseye/Dockerfile b/env/linux-arm64-bullseye/Dockerfile index c68d89a833..84adb32106 100644 --- a/env/linux-arm64-bullseye/Dockerfile +++ b/env/linux-arm64-bullseye/Dockerfile @@ -14,7 +14,6 @@ ENV DEBIAN_FRONTEND noninteractive # gdb: optionally used by runtime tests for gdb # gfortran: for compiling cgo with fortran support (multilib for 386) # git: git VCS supported by cmd/go -# gpg: the presence of a gpg binary can influence git behavior for cmd/go tests # libc6-dev: for building Go's bootstrap 'dist' prog # libgles2-mesa-dev: required by x/mobile repo # libopenal-dev: required by x/mobile repo @@ -38,8 +37,6 @@ RUN apt-get update && apt-get install -y \ gdb \ gfortran \ git \ - gpg \ - gpg-agent \ iptables \ libc6-dev \ libgles2-mesa-dev \ diff --git a/env/linux-x86-bullseye/Dockerfile b/env/linux-x86-bullseye/Dockerfile index 3b65103705..1ba180184b 100644 --- a/env/linux-x86-bullseye/Dockerfile +++ b/env/linux-x86-bullseye/Dockerfile @@ -17,7 +17,6 @@ ENV DEBIAN_FRONTEND noninteractive # gdb: optionally used by runtime tests for gdb # gfortran: for compiling cgo with fortran support (multilib for 386) # git: git VCS supported by cmd/go -# gpg: the presence of a gpg binary can influence git behavior for cmd/go tests # libc6-dev-i386: for 32-bit builds # libc6-dev: for building Go's bootstrap 'dist' prog # libgles2-mesa-dev: required by x/mobile repo @@ -44,8 +43,6 @@ RUN apt-get update && apt-get install -y \ gfortran \ gfortran-multilib \ git \ - gpg \ - gpg-agent \ iptables \ libc6-dev \ libc6-dev-i386 \