Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change to use new base images for git and pullrequest images #3828

Merged
merged 1 commit into from
Mar 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .ko.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
defaultBaseImage: gcr.io/distroless/static:nonroot
baseImageOverrides:
# git-init uses a base image that supports running either as root or as user nonroot with UID 65532.
github.com/tektoncd/pipeline/cmd/git-init: gcr.io/tekton-nightly/github.com/tektoncd/pipeline/build-base:latest
github.com/tektoncd/pipeline/cmd/git-init: gcr.io/tekton-nightly/github.com/tektoncd/pipeline/git-init-build-base:latest

# PullRequest resource needs root because in output mode it needs to access pr.json
# which might have been copied or written with any level of permissions.
github.com/tektoncd/pipeline/cmd/pullrequest-init: gcr.io/distroless/static:latest
# PullRequest resource uses a distroless base image that supports running either as root or as user nonroot with UID 65532.
github.com/tektoncd/pipeline/cmd/pullrequest-init: gcr.io/tekton-nightly/github.com/tektoncd/pipeline/pullrequest-init-build-base:latest
7 changes: 0 additions & 7 deletions images/Dockerfile

This file was deleted.

8 changes: 0 additions & 8 deletions tekton/build-push-ma-base-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@ spec:
#check the state
docker buildx inspect --bootstrap --builder builder-buildx1

#build multi-arch original build-base image
docker buildx build \
--platform $(params.platforms) \
--tag $(params.imageRegistry)/$(params.imageRegistryPath)/$(params.package)/build-base \
--push \
--no-cache \
$(workspaces.source.path)/images

#build multi-arch git-init build-base image
docker buildx build \
--platform $(params.platforms) \
Expand Down
4 changes: 2 additions & 2 deletions tekton/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ spec:
# This matches the value configured in .ko.yaml
defaultBaseImage: gcr.io/distroless/static:nonroot
baseImageOverrides:
$(params.package)/cmd/git-init: ${CONTAINER_REGISTRY}/$(params.package)/build-base:latest
$(params.package)/cmd/git-init: ${CONTAINER_REGISTRY}/$(params.package)/git-init-build-base:latest

# These match values configured in .ko.yaml
$(params.package)/cmd/entrypoint: gcr.io/distroless/base:debug-nonroot
$(params.package)/cmd/pullrequest-init: gcr.io/distroless/static:latest
$(params.package)/cmd/pullrequest-init: ${CONTAINER_REGISTRY}/$(params.package)/pullrequest-init-build-base:latest
EOF

cat ${PROJECT_ROOT}/.ko.yaml
Expand Down