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

Add a specific verion for the image gcr.io/kaniko-project/executor #878

Merged
merged 1 commit into from
May 28, 2019
Merged

Add a specific verion for the image gcr.io/kaniko-project/executor #878

merged 1 commit into from
May 28, 2019

Conversation

houshengbo
Copy link

Changes

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

See the contribution guide
for more details.

Release Notes

release-note

@googlebot googlebot added the cla: yes Trying to make the CLA bot happy with ppl from different companies work on one commit label May 18, 2019
@tekton-robot tekton-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 18, 2019
@houshengbo
Copy link
Author

/assign @vdemeester

@vdemeester
Copy link
Member

/ok-to-test

@tekton-robot tekton-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 19, 2019
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label May 28, 2019
@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: houshengbo, vdemeester

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 28, 2019
@vdemeester
Copy link
Member

@houshengbo can you rebase against master ?

@houshengbo
Copy link
Author

houshengbo commented May 28, 2019

@vdemeester I have already done it. Thanks.

@tekton-robot tekton-robot removed the lgtm Indicates that a PR is ready to be merged. label May 28, 2019
docs/taskruns.md Outdated
image: gcr.io/kaniko-project/executor
# specifying DOCKER_CONFIG is required to allow kaniko to detect docker credential
env:
- name: "DOCKER_CONFIG"
value: "/builder/home/.docker/"
=======
image: gcr.io/kaniko-project/executor:v0.9.0
>>>>>>> 85e787e8... Add a specific verion for the image gcr.io/kaniko-project/executor
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think something went wrong with the merge conflict resolution here @houshengbo ! I think what you need to do is update line 337 with v0.9.0, remove <<<<<<< HEAD and remove everything from ======= to >>>>>>> 85e787e8... Add a specific verion for the image gcr.io/kaniko-project/executor

Copy link
Author

@houshengbo houshengbo May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh sorry. forgot to resolve it.

@bobcatfish
Copy link
Collaborator

Thanks @houshengbo !

/lgtm
/meow

@tekton-robot
Copy link
Collaborator

@bobcatfish: cat image

In response to this:

Thanks @houshengbo !

/lgtm
/meow

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label May 28, 2019
@tekton-robot tekton-robot merged commit f0d334b into tektoncd:master May 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cla: yes Trying to make the CLA bot happy with ppl from different companies work on one commit lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants