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 83ee27c995850bec5c226e72195ac285409d99f4 Author: mattjackson220 <[email protected]> AuthorDate: Thu Nov 18 14:16:29 2021 -0700 disabled cgo in enroller in CiaB (#6360) * disabled cgo in enroller in CiaB * removed usergo and netgo tags (cherry picked from commit f5101cf7ebd3081a1a1056cad0f45911b6f1ae87) --- infrastructure/cdn-in-a-box/enroller/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/cdn-in-a-box/enroller/Dockerfile b/infrastructure/cdn-in-a-box/enroller/Dockerfile index cafa44e..7094a2b 100644 --- a/infrastructure/cdn-in-a-box/enroller/Dockerfile +++ b/infrastructure/cdn-in-a-box/enroller/Dockerfile @@ -30,7 +30,8 @@ RUN go_version=$(cat /GO_VERSION) && \ tar -C /usr/local -xvzf go.tar.gz && \ ln -s /usr/local/go/bin/go /usr/bin/go && \ rm go.tar.gz -ENV GOPATH=/go +ENV GOPATH=/go \ + CGO_ENABLED=0 FROM enroller-dependencies AS enroller-builder ARG ENROLLER_DEBUG_BUILD=false @@ -48,7 +49,6 @@ RUN set -o errexit -o nounset; \ go clean; \ go mod vendor -v; \ gcflags= ldflags=; \ - tags='usergo netgo'; \ if [ "$ENROLLER_DEBUG_BUILD" = true ]; then \ apt-get install -y --no-install-recommends gcc libstdc++-9-dev; \ echo 'Building Enroller without optimization or inlining'; \ @@ -57,7 +57,7 @@ RUN set -o errexit -o nounset; \ echo 'Optimizing Enroller build'; \ ldflags='-s -w'; \ fi; \ - go build -ldflags "$ldflags" -gcflags "$gcflags" -tags "$tags" + go build -ldflags "$ldflags" -gcflags "$gcflags" FROM enroller-dependencies as get-delve RUN go get github.com/go-delve/delve/cmd/dlv
