[trafficcontrol] 05/09: Fix enroller build issues (#6227)

[zr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zrhoffman pushed a commit to branch 6.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit e2e06c6f03e1fceea549b4ca2def0e79dc495f68
Author: Steve Hamrick <sh...@users.noreply.github.com>
AuthorDate: Mon Sep 20 11:10:34 2021 -0600

    Fix enroller build issues (#6227)
    
    * Fix enroller issues
    
    * Fix delve issues
    
    (cherry picked from commit c47f68ec44f3f58a166710dac2a755333c4db5ba)
---
 infrastructure/cdn-in-a-box/enroller/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/infrastructure/cdn-in-a-box/enroller/Dockerfile b/infrastructure/cdn-in-a-box/enroller/Dockerfile
index 896fbb7..cafa44e 100644
--- a/infrastructure/cdn-in-a-box/enroller/Dockerfile
+++ b/infrastructure/cdn-in-a-box/enroller/Dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM debian:buster AS enroller-dependencies
+FROM debian:bullseye AS enroller-dependencies
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -50,7 +50,7 @@ RUN set -o errexit -o nounset; \
     gcflags= ldflags=; \
     tags='usergo netgo'; \
     if [ "$ENROLLER_DEBUG_BUILD" = true ]; then \
-        apt-get install -y --no-install-recommends gcc libstdc++-8-dev; \
+        apt-get install -y --no-install-recommends gcc libstdc++-9-dev; \
         echo 'Building Enroller without optimization or inlining'; \
         gcflags='all=-N -l'; \
     else \
@@ -60,9 +60,9 @@ RUN set -o errexit -o nounset; \
     go build -ldflags "$ldflags" -gcflags "$gcflags" -tags "$tags"
 
 FROM enroller-dependencies as get-delve
-RUN go get -u github.com/go-delve/delve/cmd/dlv
+RUN go get github.com/go-delve/delve/cmd/dlv
 
-FROM debian:buster AS enroller
+FROM debian:bullseye AS enroller
 
 RUN apt-get update && apt-get install -y \
         netcat curl dnsutils net-tools \