Skip to content

Commit b5c45ec

Browse files
imjasonhtekton-robot
authored andcommitted
WIP: remove pullrequest-init-build-base
1 parent 23a856d commit b5c45ec

File tree

4 files changed

+3
-20
lines changed

4 files changed

+3
-20
lines changed

.ko.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
defaultBaseImage: gcr.io/distroless/static:nonroot
22
baseImageOverrides:
3-
# git-init uses a base image that supports running either as root or as user nonroot with UID 65532.
3+
# git-init uses a base image that includes Git, and supports running either
4+
# as root or as user nonroot with UID 65532.
45
github.com/tektoncd/pipeline/cmd/git-init: gcr.io/tekton-nightly/github.com/tektoncd/pipeline/git-init-build-base:latest
5-
6-
# PullRequest resource uses a distroless base image that supports running either as root or as user nonroot with UID 65532.
7-
github.com/tektoncd/pipeline/cmd/pullrequest-init: gcr.io/tekton-nightly/github.com/tektoncd/pipeline/pullrequest-init-build-base:latest

images/pullrequest-init/Dockerfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

tekton/build-push-ma-base-image.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,6 @@ spec:
7676
--no-cache \
7777
$(workspaces.source.path)/images/git-init
7878
79-
#build multi-arch pullrequest-init build-base image
80-
docker buildx build \
81-
--platform "${PLATFORMS}" \
82-
--tag ${IMAGE_REGISTRY}/${IMAGE_REGISTRY_PATH}/${PACKAGE}/pullrequest-init-build-base \
83-
--push \
84-
--no-cache \
85-
$(workspaces.source.path)/images/pullrequest-init
86-
8779
volumeMounts:
8880
- mountPath: /certs/client
8981
name: dind-certs

tekton/publish.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,8 @@ spec:
108108
$(params.package)/cmd/nop: ${COMBINED_BASE_IMAGE}
109109
$(params.package)/cmd/workingdirinit: ${COMBINED_BASE_IMAGE}
110110
111+
# This matches values configured in .ko.yaml
111112
$(params.package)/cmd/git-init: ${CONTAINER_REGISTRY}/$(params.package)/git-init-build-base:latest
112-
# These match values configured in .ko.yaml
113-
$(params.package)/cmd/pullrequest-init: ${CONTAINER_REGISTRY}/$(params.package)/pullrequest-init-build-base:latest
114113
EOF
115114
116115
cat ${PROJECT_ROOT}/.ko.yaml

0 commit comments

Comments
 (0)