Merge pull request #1362 from elezar/futher-cleanup-of-distroless

Futher cleanup of distroless

Author: elezar

deployments/container/Dockerfile

@@ -12,29 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG GOLANG_VERSION=1.22.6
-FROM nvcr.io/nvidia/cuda:12.9.1-base-ubi9 AS build
-
-RUN yum install -y \
-    wget make git gcc \
-     && \
-    rm -rf /var/cache/yum/*
-
-ARG GOLANG_VERSION=x.x.x
-RUN set -eux; \
-    \
-    arch="$(uname -m)"; \
-    case "${arch##*-}" in \
-        x86_64 | amd64) ARCH='amd64' ;; \
-        ppc64el | ppc64le) ARCH='ppc64le' ;; \
-        aarch64) ARCH='arm64' ;; \
-        *) echo "unsupported architecture" ; exit 1 ;; \
-    esac; \
-    wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz \
-    | tar -C /usr/local -xz
-
-ENV GOPATH=/go
-ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
+FROM golang:1.24.6 AS base
+
+# The devel image is used for local development.
+FROM base AS devel
+
+WORKDIR /work
+COPY * .
+
+RUN make install-tools
+
+# We need to set the /work directory as a safe directory.
+# This allows git commands to run in the container.
+RUN git config --file=/.gitconfig --add safe.directory /work
+
+# The build image is used to build the device plugin applications.
+FROM base AS build
 
 WORKDIR /build
 COPY . .
@@ -44,13 +37,7 @@ ARG VERSION="N/A"
 ARG GIT_COMMIT="unknown"
 RUN make PREFIX=/artifacts cmds
 
-# We use the ubi9-minimal image as a reference image in removing unneeded dependencies.
-FROM redhat/ubi9-minimal:latest AS minimal
-
-RUN rpm -qa --queryformat='^%{NAME}-\[0-9\].*\.%{ARCH}$\n' | sort -u > /tmp/package-names.minimal
-RUN rpm -qa | sort -u > /tmp/package-list.minimal
-
-FROM nvcr.io/nvidia/distroless/go:v3.1.11-dev
+FROM nvcr.io/nvidia/distroless/go:v3.1.11-dev AS application
 
 USER 0:0
 SHELL ["/busybox/sh", "-c"]

deployments/container/Makefile

@@ -76,7 +76,6 @@ $(IMAGE_TARGETS): image-%:
 		$(DOCKER_BUILD_OPTIONS) \
 		$(DOCKER_BUILD_PLATFORM_OPTIONS) \
 		--tag $(IMAGE) \
-		--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
 		--build-arg VERSION="$(VERSION)" \
 		--build-arg GIT_COMMIT="$(GIT_COMMIT)" \
 		$(if $(LABEL_IMAGE_SOURCE),--label "org.opencontainers.image.source=$(LABEL_IMAGE_SOURCE)",) \

deployments/devel/Dockerfile

@@ -24,15 +24,15 @@ install-tools: download
 DOCKER ?= docker
 -include $(CURDIR)/versions.mk
 
-DOCKERFILE_DEVEL = deployments/devel/Dockerfile
+DOCKERFILE_DEVEL = deployments/container/Dockerfile
 DOCKERFILE_CONTEXT = deployments/devel
 
 .PHONY: .build-image
 .build-image:
 	$(DOCKER) build \
 		--progress=plain \
-		--build-arg GOLANG_VERSION=$(GOLANG_VERSION) \
 		--tag $(BUILDIMAGE) \
+		--target=devel \
 		-f $(DOCKERFILE_DEVEL) \
 		$(DOCKERFILE_CONTEXT)
 

deployments/devel/Makefile

@@ -15,8 +15,8 @@
 
 SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-DOCKERFILE_ROOT=${SCRIPTS_DIR}/../deployments/devel
+DOCKERFILE_ROOT=${SCRIPTS_DIR}/../deployments/container
 
-GOLANG_VERSION=$(grep -E "^FROM golang:.*$" ${DOCKERFILE_ROOT}/Dockerfile | grep -oE "[0-9\.]+")
+GOLANG_VERSION=$(grep -E "^FROM golang:.* AS base$" ${DOCKERFILE_ROOT}/Dockerfile | grep -oE "[0-9\.]+")
 
 echo $GOLANG_VERSION

hack/golang-version.sh

@@ -19,9 +19,6 @@ REGISTRY ?= nvcr.io/nvidia
 
 VERSION ?= v0.17.1
 
-# vVERSION represents the version with a guaranteed v-prefix
-vVERSION := v$(VERSION:v%=%)
-
 GOLANG_VERSION := $(shell ./hack/golang-version.sh)
 
 BUILDIMAGE_TAG ?= devel-go$(GOLANG_VERSION)