Replace the base image with paketobuildpacks image

Replace the base image with paketobuildpacks image Fixes vmware-tanzu#6851 Signed-off-by: Wenkai Yin(尹文开) <[email protected]>
ywk253100 · Sep 28, 2023 · 1b93b17 · 1b93b17
1 parent 4bf87c0
commit 1b93b17
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -68,10 +68,16 @@ RUN mkdir -p /output/usr/bin && \
     /go/src/github.com/vmware-tanzu/velero/hack/build-restic.sh
 
 # Velero image packing section
-FROM gcr.io/distroless/base-nossl-debian11:nonroot
+FROM paketobuildpacks/run-jammy-tiny:latest
 
 LABEL maintainer="Xun Jiang <[email protected]>"
 
+COPY hack/passwd /etc/passwd
+
+COPY hack/group /etc/group
+
+COPY --chown=65532:65532 hack/nonroot /home/nonroot
+
 COPY --from=velero-builder /output /
 
 COPY --from=restic-builder /output /

diff --git a/changelogs/unreleased/6883-ywk253100 b/changelogs/unreleased/6883-ywk253100
@@ -0,0 +1 @@
+Replace the base image with paketobuildpacks image
diff --git a/hack/docker-push.sh b/hack/docker-push.sh
@@ -89,7 +89,7 @@ else
 fi
 
 if [[ -z "$BUILDX_PLATFORMS" ]]; then
-    BUILDX_PLATFORMS="linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le"
+    BUILDX_PLATFORMS="linux/amd64,linux/arm64"
 fi
 
 # Debugging info

diff --git a/hack/group b/hack/group
@@ -0,0 +1,5 @@
+root:x:0:
+nobody:x:65534:
+tty:x:5:
+staff:x:50:
+nonroot:x:65532:
diff --git a/hack/nonroot/.placeholder b/hack/nonroot/.placeholder
diff --git a/hack/passwd b/hack/passwd
@@ -0,0 +1,3 @@
+root:x:0:0:root:/root:/sbin/nologin
+nobody:x:65534:65534:nobody:/nonexistent:/sbin/nologin
+nonroot:x:65532:65532:nonroot:/home/nonroot:/sbin/nologin
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Replace the base image with paketobuildpacks image