harden image using apko and wolfi

Signed-off-by: Kent Rancourt <[email protected]>

.github/workflows/ci.yaml

@@ -188,15 +188,29 @@ jobs:
   build-image:
     needs: [test-unit, lint-go, lint-charts, lint-proto, lint-ui, check-codegen]
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+        - 5000:5000
     steps:
     - name: Set up QEMU
       uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
-    - name: Build
+      with:
+        driver-opts: network=host
+    - name: Build base image
+      run: |
+        BASE_IMAGE=localhost:5000/kargo-base:latest make build-base-image
+        docker push localhost:5000/kargo-base:latest-arm64
+        docker push localhost:5000/kargo-base:latest-amd64
+    - name: Build final image
       uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
       with:
         platforms: linux/amd64,linux/arm64
+        build-args: |
+          BASE_IMAGE=localhost:5000/kargo-base
         push: false
         cache-from: type=gha
         cache-to: type=gha,mode=max

.github/workflows/release.yaml

@@ -67,12 +67,18 @@ jobs:
         tags: |
           type=semver,pattern={{raw}}
           type=raw,value=${{ steps.unstable-version.outputs.unstable-version }},enable=${{ github.event_name != 'release'}}
-    - name: Build and push
+    - name: Build base image
+      run: |
+        BASE_IMAGE=localhost:5000/kargo-base make build-base-image
+        docker push localhost:5000/kargo-base:latest-arm64
+        docker push localhost:5000/kargo-base:latest-amd64
+    - name: Build and push final image
       id: image
       uses: docker/build-push-action@v6
       with:
         platforms: linux/amd64,linux/arm64
         build-args: |
+          BASE_IMAGE=localhost:5000/kargo-base
           VERSION=${{ github.ref_name }}
           GIT_COMMIT=${{ github.sha }}
           GIT_TREE_STATE=clean
@@ -163,6 +169,11 @@ jobs:
   publish-cli:
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+        - 5000:5000
     container:
       image: golang:1.23.2-bookworm
     strategy:

.gitignore

@@ -2,6 +2,7 @@
 .pnpm-store/
 .vscode/
 bin/
+build/
 charts/kargo/*.tgz
 coverage.txt
 hack/include/

Dockerfile

@@ -1,3 +1,5 @@
+ARG BASE_IMAGE=kargo-base
+
 ####################################################################################################
 # ui-builder
 ####################################################################################################
@@ -68,33 +70,16 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.4.15 && \
     curl -fL -o /tools/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-${TARGETOS}-${TARGETARCH} && \
     chmod +x /tools/grpc_health_probe
 
-####################################################################################################
-# base
-# - install necessary packages
-####################################################################################################
-FROM ghcr.io/akuity/kargo-render:v0.1.0-rc.39 AS base
-
-USER root
-
-RUN apk update \
-    && apk add ca-certificates gpg gpg-agent
-
-COPY --from=tools /tools/ /usr/local/bin/
-
-USER 1000:0
-
-CMD ["/usr/local/bin/kargo"]
-
 ####################################################################################################
 # back-end-dev
 # - no UI
 # - relies on go build that runs on host
 # - supports development
 # - not used for official image builds
 ####################################################################################################
-FROM base AS back-end-dev
+FROM alpine:3.20.3 AS back-end-dev
 
-USER root
+RUN apk update && apk add git gpg gpg-agent openssh-client
 
 COPY bin/credential-helper /usr/local/bin/credential-helper
 COPY bin/controlplane/kargo /usr/local/bin/kargo
@@ -129,14 +114,9 @@ CMD ["pnpm", "dev"]
 # - the official image we publish
 # - purposefully last so that it is the default target when building
 ####################################################################################################
-FROM base AS final
-
-USER root
+FROM ${BASE_IMAGE}:latest-${TARGETARCH} AS final
 
 COPY --from=back-end-builder /kargo/bin/ /usr/local/bin/
 COPY --from=tools /tools/ /usr/local/bin/
 
-RUN adduser -D -H -u 1000 kargo
-USER 1000:0
-
 CMD ["/usr/local/bin/kargo"]

Makefile

@@ -15,6 +15,8 @@ VERSION_PACKAGE := github.com/akuity/kargo/internal/version
 CONTAINER_RUNTIME ?= docker
 
 IMAGE_REPO 			?= kargo
+LOCAL_REG_PORT  ?= 5000
+BASE_IMAGE 			?= localhost:$(LOCAL_REG_PORT)/$(IMAGE_REPO)-base
 IMAGE_TAG 			?= dev
 IMAGE_PUSH 			?= false
 IMAGE_PLATFORMS 	=
@@ -119,6 +121,26 @@ test-unit:
 # required tools, refer to the hacking section toward the bottom of this file. #
 ################################################################################
 
+################################################################################
+# Build: Targets to help build                                                 #
+################################################################################
+
+.PHONY: clean
+clean:
+	rm -rf build
+
+.PHONY: build-base-image
+build-base-image:
+	mkdir -p build
+	cp kargo-base.apko.yaml build
+	docker run \
+		--rm \
+		-v $(dir $(realpath $(firstword $(MAKEFILE_LIST))))build:/build \
+		-w /build \
+		cgr.dev/chainguard/apko \
+		build kargo-base.apko.yaml $(BASE_IMAGE) kargo-base.tar.gz
+	docker image load -i build/kargo-base.tar.gz
+
 .PHONY: build-cli
 build-cli:
 	CGO_ENABLED=0 go build \
@@ -269,13 +291,21 @@ hack-codegen: hack-build-dev-tools
 # Build a linux/amd64 image with a docker build option to not re-use docker build cache
 # 	make hack-build IMAGE_PLATFORMS=linux/amd64 DOCKER_BUILD_OPTS=--no-cache
 .PHONY: hack-build
-hack-build:
-	$(CONTAINER_RUNTIME) buildx build \
-		$(DOCKER_BUILD_OPTS) \
-		--build-arg GIT_COMMIT=$(shell git rev-parse HEAD) \
-		--build-arg GIT_TREE_STATE=$(shell if [ -z "`git status --porcelain`" ]; then echo "clean" ; else echo "dirty"; fi) \
-		--tag $(IMAGE_REPO):$(IMAGE_TAG) \
-		.
+hack-build: build-base-image
+	@{ \
+		$(CONTAINER_RUNTIME) run -d -p 5000:$(LOCAL_REG_PORT) --name tmp-registry registry:2; \
+		trap '$(CONTAINER_RUNTIME) rm -f tmp-registry' EXIT; \
+		docker push $(BASE_IMAGE):latest-amd64; \
+		docker push $(BASE_IMAGE):latest-arm64; \
+		$(CONTAINER_RUNTIME) buildx build \
+			$(DOCKER_BUILD_OPTS) \
+			--network host \
+			--build-arg BASE_IMAGE=$(BASE_IMAGE) \
+			--build-arg GIT_COMMIT=$(shell git rev-parse HEAD) \
+			--build-arg GIT_TREE_STATE=$(shell if [ -z "`git status --porcelain`" ]; then echo "clean" ; else echo "dirty"; fi) \
+			--tag $(IMAGE_REPO):$(IMAGE_TAG) \
+			.;\
+	}
 
 .PHONY: hack-build-cli
 hack-build-cli: hack-build-dev-tools

kargo-base.apko.yaml

@@ -0,0 +1,26 @@
+contents:
+  keyring:
+  - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
+  repositories:
+  - https://packages.wolfi.dev/os
+  packages:
+  - git~2
+  - gpg~2
+  - gpg-agent~2
+  - helm~3
+  - kustomize~5
+  - openssh-client~9
+
+accounts:
+  groups:
+  - groupname: nonroot
+    gid: 65532
+  users:
+  - username: nonroot
+    uid: 65532
+    gid: 65532
+  run-as: "65532"
+
+archs:
+- arm64
+- amd64