Skip to content

Commit 80859c0

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #20681 from adambkaplan/feature/s2i-dockerfile
bump(*):
2 parents adb5588 + 094a3ba commit 80859c0

File tree

6 files changed

+213
-124
lines changed

6 files changed

+213
-124
lines changed

‎glide.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/image/v1/types.go

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/source-to-image/pkg/build/strategies/dockerfile/dockerfile.go

Lines changed: 62 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/source-to-image/pkg/util/injection_test.go

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/source-to-image/pkg/util/status/build_status.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)