1
0
mirror of https://github.com/openshift/source-to-image.git synced 2026-02-05 12:44:54 +01:00
Commit Graph

107 Commits

Author SHA1 Message Date
Corey Daley
8ca83f8ce1 code changes for k8s.io/klog/v2 2020-10-01 20:59:50 -04:00
Adam Kaplan
19d753b6f6 Migrate glog to klog 2019-07-15 12:53:19 -04:00
Adam Kaplan
9c608549ea Bump golang to 1.12 2019-06-06 15:13:54 -04:00
soulseen
b09aa26e92 remove basename in main()
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-05-20 11:24:25 +08:00
Corey Daley
95ebbabfb9 Refactoring the S2I command line interface
Closes #443
2017-06-26 11:06:04 -04:00
Jim Minter
7751799a38 use only one engine client instance 2017-04-26 16:19:00 +01:00
guangxuli
7e291d806d fix kill container failed warning
update

print failed info

fix fail print

address comment
2017-03-31 08:43:15 +08:00
guangxuli
2816855ca0 delete deprecated force pull flag
update bash and zsh

remove --force-pull
2017-03-28 10:55:04 +08:00
guangxuli
bd33ac6e86 set each default pull policy at begining 2017-03-22 15:14:36 +08:00
OpenShift Bot
4dd7721590 Merge pull request #682 from oatmealraisin/rymurphy/587
Merged by openshift-bot
2017-03-20 11:55:17 -05:00
oatmealraisin
5e3fd039d3 Changed splitting index of Volume specs to first :
This allows us to specify file modes when Docker mounts, such as :Z or
:rw
2017-03-17 15:56:17 -04:00
guangxuli
c0d7d54b4d fix Default s2i rebuild image pull policy not work correctly 2017-03-13 20:22:05 +08:00
Corey Daley
a8f4df0479 Overhaul of Source-to-Image
Updating README(s), templates, and examples
2017-02-23 10:15:59 -05:00
Rodolfo Carvalho
bc2e858e0d Prefer using https:// instead of git:// (#647)
* Prefer using https:// instead of git://

Both protocols are "smart" and should have similar performance.
HTTPS is encrypted, while the Git transport is plaintext.
HTTPS verifies the certificate of the server.

* Clean up comment

- "the source" means "s"
- no need to enumerate protocols
2017-01-06 11:50:27 -05:00
Victor
70c2f5ac3a improve failure status messages 2017-01-05 10:25:28 +01:00
Shiyang Wang
514d320360 add zsh completions for s2i
change condition

modify verify-bash-completion.sh

change to pass golint

change to pass golint
2016-12-22 11:13:00 +08:00
yuanxiao
edef3e11c2 refactor func checkErr to CheckError
Signed-off-by: yuanxiao <yuan.xiao5@zte.com.cn>
2016-12-12 10:01:59 +08:00
Jim Minter
1a0ef1eb7e miscellaneous changes associated with s2i windows work
- add missing function documentation
- fix govet shadow warnings
- fix spelling errors
- add .atom-build.yml to .gitignore
- don't mess up bash completions if build fails
- re-enable test-go.sh race checker as documented
- remove extraneous goroutines in tests
- use ExcludeRegExp in integration tests
- remove finished containers in integration tests
2016-11-28 15:13:50 +00:00
Jim Minter
10129f1a55 Add --tls,--tlsverify options and respect DOCKER_* environment variables more closely 2016-10-19 09:20:47 +01:00
Jim Minter
0604914056 fix lint warnings 2016-10-18 11:21:52 +01:00
Victor
9ce397d0b7 add build info 2016-10-14 16:20:36 +02:00
gabemontero
8c24edb036 s2i: s2i rebuild broken
Bug 1366475
Bugzilla link https://bugzilla.redhat.com/show_bug.cgi?id=1366475
Detailed explanation
an attempt to pull the builder image to obtain labels was made; the correct thing was
to pull the locally build image we were rebuilding
2016-08-12 13:55:55 -04:00
Slava Semushin
215226b0ed Minor improvements to exteded builds.
- update command line options descriptions to mention assemble-runtime
  script
- move assemble-runtime script to the scripts sub-directory in the
  resulting application image (run script is already here, so it looks
  strange that they're in a different places)
- simplify code a bit (before we were extracting USER from the runtime
  image and passing this user to the Docker during runtime container
  creation. It looks useless, because we can just omit user and Docker
  will use default USER for us)
2016-07-14 12:42:31 +02:00
OpenShift Bot
53703c5af6 Merge pull request #505 from php-coder/extended_build
Merged by openshift-bot
2016-07-08 12:59:39 -04:00
Slava Semushin
626f7cc2da Add support for extended build.
From now you can create final image that is based on the image that is
different than builder image. To use it provide --runtime-image option
with image that will be used in runtime.

Also specify --runtime-artifact option (one or more times) with a list
of files and directories that will be copied into resulting image.
Alternatively this mapping can be extracted from the
io.openshift.s2i.assemble-input-files annotation on a runtime image.

To execute custom logic to arrange image to a desired state, you can
leverage "assemble-runtime" script. You can 1) put it .s2i/bin directory
with application sources 2) download it from remote location (-s option)
or 3) have it inside a runtime image (but don't forget to add
io.openshift.s2i.scripts-url label on it).
2016-07-08 17:30:01 +02:00
Ben Parees
62909fc85c replace broken --recursive with a working --ignore-submodules option 2016-07-05 23:36:47 -04:00
jupierce
05c257c1f2 Migrating s2i to use glog mock library 2016-06-28 13:51:51 -04:00
Rodolfo Carvalho
5ed269f47d Name s2i containers explicitly
Instead of leaving the name blank and letting the Docker daemon name
containers with random strings like 'lonely_thompson', we give proper
names so that we can identify and filter containers created by S2I
later.

Names take a fixed prefix, 's2i_', and a random suffix. The builder
image is also used to compose the container name, replacing with
underscores characters that would be invalid for a container name.

Example:

$ s2i build \
    git://github.com/openshift/ruby-hello-world \
    centos/ruby-22-centos7 \
    hello-world-app

The above creates a temporary container named
's2i_centos_ruby_22_centos7_397cfecd'.
2016-06-27 16:41:17 +02:00
Slava Semushin
246d932776 Don't use deprecated option/file/image.
- don't use deprecated image: openshift/wildfly-8-centos -> openshift/wildfly-100-centos7
- update docs to use --pull-policy instead of deprecated --force-pull.
- replace .stifile by .s2ifile in --use-config option description.
2016-05-13 15:57:54 +02:00
Slava Semushin
189f31945b Minor code improvements.
- Bootstrap.process(): don't try to do chmod on Windows
- cmd/s2i/main.go: fix file descriptors leak
- GenerateConfigFromLabels: remove unused parameter
- GenerateConfigFromLabels: use local variable for a list of labels
- sti.New(): rename argument from req to config
- DefaultCleaner: don't inherit ~30 methods while we're using just two
- STI.Prepare(): simplify
- DockerIgnorer.getListOfFilesToIgnore(): pass string instead of api.Config
- util.FixInjectionsWithRelativePath: rewrite to not modify its argument
2016-05-06 23:25:48 +02:00
Michal Fojtik
1c8b079337 Add support for bind mounts 2016-05-04 18:15:36 +02:00
Michal Fojtik
0144a76db5 Use cobra for parsing multiple env variables 2016-04-28 13:30:36 +02:00
gabemontero
2b2606720e make tar stream exclusion regexp configurable 2016-04-06 13:39:42 -04:00
OpenShift Bot
676818bcfa Merge pull request #459 from rhcarvalho/update-todo
Merged by openshift-bot
2016-04-05 12:11:02 -04:00
Rodolfo Carvalho
7739cdd347 Clarify TODO message 2016-04-05 16:24:12 +02:00
Michal Fojtik
d10b716f3d Follow up for bash completion 2016-04-05 16:14:04 +02:00
Michal Fojtik
ccd99c04a5 Add Bash completetion for s2i command 2016-04-05 13:44:28 +02:00
Michal Fojtik
edbb438d2c Bug 1318395: Add timeout check for Docker API calls 2016-03-17 12:54:59 +01:00
gabemontero
776d965b2e add option to only attempt copy command on source url 2016-03-14 16:08:13 -04:00
Cesar Wong
1f56b0f81d Allowing dropping capabilities when running a container 2016-03-07 13:00:49 -05:00
Ben Parees
80b9ab2774 expose previous image pull policy as a flag 2016-02-18 17:27:18 +01:00
Rodolfo Carvalho
dcaf190315 Remove custom SIGQUIT handler
Go prints a stack trace of all goroutines by default on SIGQUIT, except
those related to the runtime. To include all goroutines, set
GOTRACEBACK=2 or GOTRACEBACK=crash.

This custom handler was suppressing Go's default behavior.
2016-02-09 16:15:26 +01:00
Maciej Szulik
7064810ce0 .stifile -> .s2ifile 2016-02-03 09:43:00 +01:00
OpenShift Bot
db6b3c3293 Merge pull request #387 from danmcp/master
Merged by openshift-bot
2016-01-14 11:40:27 -05:00
Dan McPherson
2912f39ef5 STI -> S2I 2016-01-14 11:10:20 -05:00
OpenShift Bot
8720f45555 Merge pull request #386 from danmcp/master
Merged by openshift-bot
2016-01-14 10:00:03 -05:00
Dan McPherson
b4b0344d8e STI -> S2I 2016-01-13 14:19:02 -05:00
Michal Fojtik
2cb814b5a6 Support injecting files into a container that runs assemble script 2016-01-11 10:52:08 +01:00
Zuzana Svetlikova
211cb3aa13 Add space to separate link from next word 2015-12-09 15:54:07 +01:00
Slava Semushin
3de505fed9 Fix file descriptor leak when .dockercfg was found. 2015-11-25 12:27:32 +01:00