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

63 Commits

Author SHA1 Message Date
Adam Kaplan
6815fa6d92 Allow URLs for Image Scripts Location
* Rename ImageScriptsDir to ImageScriptsURL
* Allow ImageScriptsURL to download scripts from filesystem, web, etc.
* Add default path for image scripts
* Update cli and completions
2018-08-10 11:38:08 -04:00
Adam Kaplan
69bea69450 Fix Hang if Injected Dir Does Not Exist
- Added a "response file" to report failed injections on s2i
container
- Fixed assemble command to ensure s2i container exits if
injection fails

OpenShift bug 1608714
2018-07-30 13:30:05 -04:00
Adam Kaplan
f7aed52d47 Incremental Dockerfile Build
Allow incremental --as-dockerfile builds.

Trello card: https://trello.com/c/P6TZg0wO/1582-5-builds-s2i-incremental-build-as-dockerfile
2018-07-20 10:44:58 -04:00
Adam Kaplan
cfd8419086 Check Assemble Users Against Allowed UIDs
Adding check to ensure the s2i assemble user is allowed if the --allowed-uids flag is set.
The assemble user can come from one of two sources:

1. --assemble-user flag
2. builder image io.openshift.s2i.assemble-user label

The assemble user overrides the default image user for an s2i build.
However, if the base image has ONBUILD instructions with USER directives,
all USER directives will be checked to ensure compliance.

Bug 1582976
2018-05-29 10:55:15 -04:00
Ben Parees
62488a5747 Option to produce a buildable Dockerfile instead of an image when building 2018-05-25 10:33:41 -04:00
Adam Kaplan
1489f8db57 Keep Option for Injected Files
* Adding a Keep option to VolumeSpec so that files can be kept in s2i builds.
* This will be used to support the injection of ConfigMap build sources, which should not be truncated.

Trello card: https://trello.com/c/RMKJxJUm/1020-5-allow-using-a-configmap-as-an-input-to-a-build-builds
2018-05-03 15:24:19 -04:00
Adam Kaplan
be7f83aeeb Parse multiple volumes via semicolon delimeter.
Fixes issue #872
2018-05-01 11:36:50 -04:00
Maciej Szulik
173efccd3c Code changes to match current dependecies 2017-11-28 13:14:11 +01:00
Jim Minter
7da3d3e975 git URL parsing rewrite 2017-07-13 09:09:56 +01:00
Jim Minter
d4e9bd0df6 break out util/cmd, util/fs, util/cygpath packages 2017-07-11 13:58:16 +01:00
Corey Daley
125027dde5 Removing Payload field
Closes #629
2017-07-06 23:32:28 -04:00
jkim
2dedbd8635 update to add and/or update docker labels with a JSON file
add a new md file in /docs folder
2017-06-21 08:37:09 -04:00
Jim Minter
df3fe56aca prevent huge numbers of hanging goroutines 2017-04-26 16:19:20 +01:00
Jim Minter
7751799a38 use only one engine client instance 2017-04-26 16:19:00 +01:00
Jim Minter
952341a9d6 Don't use force remove, as it can cause docker to leak storage 2017-03-14 17:50:36 +00: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
Rodolfo Carvalho
43742b1956 Add regression test for incremental builds
Ensure the build takes no more than DefaultDockerTimeout, what would
suggest that S2I got stuck waiting for the timeout.
2016-12-04 19:38:21 +01:00
Jim Minter
251057d7f3 s2i windows build enablement
- enable use of cygwin to build and test s2i
- simplify git and file downloaders
- track posix file permissions on windows
- remove unnecessary runtime.GOOS == "windows" checks
- unit test fixes
2016-11-29 19:17:50 +00: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
dc8066e476 update s2i after backwards bump of github.com/docker/engine-api 2016-11-03 12:52:00 +00:00
OpenShift Bot
e065d33b56 Merge pull request #628 from php-coder/gh522_fix_callback_url
Merged by openshift-bot
2016-11-02 11:38:14 -04:00
Slava Semushin
5b2f0ee81f Invoke callback URL when build has failed. 2016-11-02 15:24:22 +01:00
Rodolfo Carvalho
85d6248b92 Remove invalid build constraint
As fas as the git history can tell, the constraint was never referenced
by any script, never used.

$ go vet test/integration/integration_test.go
test/integration/integration_test.go:1: invalid non-alphanumeric build
constraint: integration,!no-docker
2016-11-01 21:16:16 +01: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
Jim Minter
9be38ef5f8 Remove use of k8s.io/kubernetes/pkg/kubelet/dockertools 2016-10-17 14:12:02 +01:00
Victor
9ce397d0b7 add build info 2016-10-14 16:20:36 +02:00
Ben Parees
7032fa4c49 use docker-engine for inspect image 2016-09-28 13:28:03 -04:00
gabemontero
7f8cd156d0 s2i switch to k8s/engine-api 2016-08-16 15:57:42 -04:00
Ben Parees
83d61bad08 Change override entrypoint to /usr/bin/env 2016-08-07 11:30:43 -04:00
Rodolfo Carvalho
8621b172b5 Apply several small fixes from go vet and others
Includes:
- Changes to commentaries to follow godoc conventions;
- Fix shadowing of identifiers;
- Missing error checks;
- Fix incorrect usages of fmt.Print* functions;
- Initialize struct literals from other packages using explicit field
  names;
- Rename variables to follow Go conventions.
2016-05-18 12:06:08 +02:00
Michal Fojtik
1c8b079337 Add support for bind mounts 2016-05-04 18:15:36 +02:00
Cesar Wong
6c7e58fde4 Throw an error if a scripts URL is specified but no scripts can be downloaded from it 2016-03-29 17:05:48 -04:00
Michal Fojtik
e5455214a2 Refactor S2I script installation 2016-01-27 12:32:13 +01:00
Ben Parees
1ba89992d4 return error if pull fails 2016-01-17 12:44:03 -05:00
Michal Fojtik
8a7b538a5d Add GetImageWorkdir and use it to set relative path for injections properly 2016-01-13 14:48:47 +01:00
Michal Fojtik
2cb814b5a6 Support injecting files into a container that runs assemble script 2016-01-11 10:52:08 +01:00
Dan McPherson
c41a504908 Fix case 2015-11-21 23:24:31 -05:00
Michal Fojtik
90134c695d Replace --force-pull with --pull-policy 2015-11-06 11:54:19 +01:00
Cesar Wong
965426e9f4 Add allowed-uids flag to the STI command 2015-08-11 17:04:49 -04:00
OpenShift Bot
b6fd265954 Merge pull request #229 from ewolinetz/onbuild_int_test
Merged by openshift-bot
2015-07-15 17:44:23 -04:00
ewolinetz
22d22a4b6b Adding test cases for ONBUILD strategy builds and no ImageID cases 2015-07-14 10:28:58 -05:00
gabemontero
81cf061419 issue 133 turn on loglevel 5 when -v passed into test script; take in Maciej's comments 2015-07-06 16:52:51 -04:00
Michal Fojtik
88295cb030 Fix documentation to mention new label 2015-06-26 16:05:42 +02:00
Maciej Szulik
fbfcc2cd88 Issue 205 - renamed io.openshift.sti.* label to shorter io.s2i.* 2015-05-29 20:48:26 +02:00
OpenShift Bot
bd57bafeb4 Merge pull request #204 from soltysh/issue144
Merged by openshift-bot
2015-05-29 06:37:21 -04:00
Maciej Szulik
ad4dd9e325 Added method for validating Config object - should fix #144.
Reviewed and removed unnecessary fields from Config, which was also
renamed from Request (fixed #100).
2015-05-29 12:29:04 +02:00
Maciej Szulik
f9bb583851 Issue 199 - removing unnecessary FIXME information and user removal from
integration test images.
2015-05-27 11:27:25 +02:00
Maciej Szulik
ded1aaa5d8 Issue 183 - migrated STI_SCRIPTS_URL and STI_LOCATION environment
variables to io.openshift.sti.scripts-url and
io.openshift.sti.location labels.
2015-05-25 16:25:32 +02:00