cni-metrics-helper minimal base image; simplify dockerfile

aws · Dec 28, 2022 · 6fac830 · 6fac830
1 parent a5823c0
commit 6fac830
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/scripts/dockerfiles/Dockerfile.init b/scripts/dockerfiles/Dockerfile.init
@@ -9,8 +9,6 @@ ENV GOPROXY=direct
 
 # Copy modules in before the rest of the source to only expire cache on module changes:
 COPY go.mod go.sum ./
-RUN go mod download
-
 COPY Makefile ./
 RUN make plugins && make debug-script
 

diff --git a/scripts/dockerfiles/Dockerfile.metrics b/scripts/dockerfiles/Dockerfile.metrics
@@ -6,17 +6,13 @@ WORKDIR /go/src/github.com/aws/amazon-vpc-cni-k8s
 ENV GO111MODULE=on
 ENV GOPROXY=direct
 
-# Copy modules in before the rest of the source to only expire cache on module
-# changes:
+# Copy modules in before the rest of the source to only expire cache on module changes:
 COPY go.mod go.sum ./
-RUN go mod download
-
 COPY . ./
 RUN make build-metrics
 
-FROM public.ecr.aws/amazonlinux/amazonlinux:2
-RUN yum update -y && \
-	yum clean all
+# Build from EKS minimal base + glibc
+FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-glibc:latest.2
 
 # Copy our bundled certs to the first place go will check: see
 # https://golang.org/src/pkg/crypto/x509/root_unix.go

diff --git a/scripts/dockerfiles/Dockerfile.release b/scripts/dockerfiles/Dockerfile.release
@@ -9,8 +9,6 @@ ENV GOPROXY=direct
 
 # Copy modules in before the rest of the source to only expire cache on module changes:
 COPY go.mod go.sum ./
-RUN go mod download
-
 COPY Makefile ./
 COPY . ./
 RUN make build-aws-vpc-cni && make build-linux