openshift/source-to-image
1
0
Fork 0
mirror of https://github.com/openshift/source-to-image.git synced 2026-02-05 21:44:56 +01:00
Code Issues Releases Activity
1,528 Commits 32 Branches 47 Tags
coreydaley-patch-2
Commit Graph

82 Commits

Author SHA1 Message Date
Corey Daley
898b43c0a1 commiting results of running goio 2023-03-16 00:59:21 -04:00
Nalin Dahyabhai
01d9d0362c test/integration/testdata: update certificates 
Regenerate TLS certificates used for TLS connectivity tests, and
add a script that can be re-run to do that.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2022-06-29 15:59:35 -04:00
Nalin Dahyabhai
a9726865b2 go fmt test/integration/docker 
Run `go fmt` on the test/integration/docker package, flagged by
the verify job in CI.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2022-06-29 15:59:35 -04:00
Nalin Dahyabhai
e72ed0c67f Update for API changes in dependencies 
The client ContainerCreate() method now takes an optional Platform
argument, but we'll just pass `nil` in for now.

In integration tests, recognize when ContainerWait(WaitConditionNextExit)
timed out because the container had already exited and work around it.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2022-06-29 15:58:57 -04:00
Corey Daley
8ca83f8ce1 code changes for k8s.io/klog/v2 2020-10-01 20:59:50 -04:00
Corey Daley
adfc3ee2f4 Cleaning up imports 2020-06-02 14:29:57 -04:00
Igor Sutton Lopes
888560cf0d Add 'docker://' to the builder image if it doesn't have a scheme 2020-02-10 13:15:39 +01:00
Igor Sutton Lopes
f8dcf74445 Add generate command 
This change adds the generate command to s2i, where it allows
the user to produce a Dockerfile able to be used by any build
system supporting the format, such as buildah and possibly
others.
 2020-01-23 16:26:18 +01:00
Adam Kaplan
2044e2993f Reduce usage of docker/docker 
* Use moby/buildkit for dockerfile parsing
* Refactor TestConvertEnvironmentToDocker to be a true unit test.
 2019-12-10 21:47:58 -05:00
soulseen
739bc0504f remove func GetStrategy 2019-08-07 22:55:57 +08: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
Adam Kaplan
2308927668 Refactor s2i Tests for ci-operator 
* Isolate integration tests that don't require Docker
* Add OWNERS file
* Add make commands to run integration tests
 2019-06-06 11:33:13 -04:00
Nabil BENDAFI
63a03d162d Integration test: .s2iignore during copy from local directory 2019-04-30 22:28:50 +02:00
Adam Kaplan
c268d8c561 dockerfile - Report Error if No Scripts Install 
* Raise an error if no scripts are downloaded from the ScriptsURL
* Update unit and integration tests to check for raised errors

Fixes bug 1668130
 2019-01-23 11:10:50 -05:00
Adam Kaplan
3d27e9ded5 Dockerfile Run COPY and CHOWN as root 
Ensure all chown commands run as root.
Assemble user in general does not have permission to do this.
 2018-08-23 14:50:16 -04:00
Adam Kaplan
70703fcc16 Remove --chown in Dockerfile 
Allows Dockerfile builds to be compatible with buildah/imagebuilder.

DEVEXP-124
 2018-08-17 09:27:04 -04:00
Adam Kaplan
b0889726d3 Eliminate delete file script 
Use RUN rm xxx directives instead.
 2018-08-16 18:17:12 -04:00
Adam Kaplan
075b8b9c36 Dockerfile Injection Removal 
* Add script to remove secrets injected into Dockerfile builds
* Ensure dockerfile failure reason is reported in build result
 2018-08-16 13:06:11 -04:00
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