feat: remove linting/gen from dockerfile (#1334)

* feat: remove linting/gen from dockerfile

Signed-off-by: Alessio Pragliola <[email protected]>

* fix: missing checkout in action

Signed-off-by: Alessio Pragliola <[email protected]>

* fix: change prepare step

Signed-off-by: Alessio Pragliola <[email protected]>

* feat: make test target atomic

Signed-off-by: Alessio Pragliola <[email protected]>

* feat: make the jobs depend on prepare

Signed-off-by: Alessio Pragliola <[email protected]>

---------

Signed-off-by: Alessio Pragliola <[email protected]>

Author: Al-Pragliola

.github/workflows/build-and-push-image.yml

@@ -21,8 +21,11 @@ env:
   DOCKER_USER: ${{ github.actor }}
   DOCKER_PWD: ${{ secrets.GITHUB_TOKEN }}
 jobs:
+  prepare:
+    uses: ./.github/workflows/prepare.yml
   build-image:
     runs-on: ubuntu-latest
+    needs: prepare
     steps:
       # Assign context variable for various action contexts (tag, main, CI)
       - name: Assigning tag context
@@ -44,6 +47,7 @@ jobs:
         if: env.BUILD_CONTEXT == 'tag'
         run: |
           echo "VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
+      - uses: ./.github/workflows/prepare.yml
       - name: Build and Push Image
         shell: bash
         run: ./scripts/build_deploy.sh

.github/workflows/build.yml

@@ -14,29 +14,19 @@ on:
       - ".github/dependabot.yml"
       - "docs/**"
 jobs:
+  prepare:
+    uses: ./.github/workflows/prepare.yml
   build:
+    needs: prepare
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
           go-version: "1.24"
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.9
       - name: Build
-        run: make clean build
-      - name: Check if there are uncommitted file changes
-        run: |
-          clean=$(git status --porcelain)
-          if [[ -z "$clean" ]]; then
-              echo "Empty git status --porcelain: $clean"
-          else
-              echo "Uncommitted file changes detected: $clean"
-              git diff
-              exit 1
-          fi
+        run: make build/compile
       - name: Unit tests
         run: make test-cover

.github/workflows/prepare.yml

@@ -0,0 +1,24 @@
+on:
+  workflow_call
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.24"
+      - name: Prepare
+        run: make clean build/prepare
+      - name: Check if there are uncommitted file changes
+        run: |
+          clean=$(git status --porcelain)
+          if [[ -z "$clean" ]]; then
+              echo "Empty git status --porcelain: $clean"
+          else
+              echo "Uncommitted file changes detected: $clean"
+              git diff
+              exit 1
+          fi

Dockerfile

@@ -22,44 +22,10 @@ COPY templates/ templates/
 COPY patches/ patches/
 COPY catalog/ catalog/
 
-###### Dev stage - start ######
-# see: https://github.com/kubeflow/model-registry/pull/984#discussion_r2048732415
-
-FROM common AS dev
-
-USER root
-
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o model-registry
-
-FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS dev-build
-
-WORKDIR /
-COPY --from=dev /workspace/model-registry .
-USER 65532:65532
-
-ENTRYPOINT ["/model-registry"]
-
-###### Dev stage - end ######
-
 FROM common AS builder
 
 USER root
-# default NodeJS 14 is not enough for openapi-generator-cli, switch to Node JS currently supported
-RUN yum remove -y nodejs npm
-RUN yum module -y reset nodejs
-RUN yum module -y enable nodejs:18
-# install npm and java for openapi-generator-cli
-RUN yum install -y nodejs npm java-11-headless python3
-
-RUN make deps
-
-# NOTE: The two instructions below are effectively equivalent to 'make clean build'
-# DO NOT REMOVE THE 'build/prepare' TARGET!!!
-# It ensures consitent repeatable Dockerfile builds
 
-# prepare the build in a separate layer
-RUN make clean build/prepare
-# compile separately to optimize multi-platform builds
 RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} make build/compile
 
 # Use distroless as minimal base image to package the model-registry binary

Makefile

@@ -300,15 +300,15 @@ lint/csi: bin/golangci-lint
 	${GOLANGCI_LINT} run internal/csi/...
 
 .PHONY: test
-test: gen bin/envtest
+test: bin/envtest
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" ${GO} test ./internal/... ./pkg/...
 
 .PHONY: test-nocache
-test-nocache: gen bin/envtest
+test-nocache: bin/envtest
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" ${GO} test ./internal/... ./pkg/... -count=1
 
 .PHONY: test-cover
-test-cover: gen bin/envtest
+test-cover: bin/envtest
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" ${GO} test ./internal/... ./pkg/... -coverprofile=coverage.txt
 	${GO} tool cover -html=coverage.txt -o coverage.html