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

1311 Commits

Author SHA1 Message Date
liangxia
22b89046f1 URL of OKD is docs.okd.io now 2018-09-19 09:17:29 +08:00
OpenShift Bot
ecaaa701d6 Merge pull request #924 from liangxia/openshift-2-sclorg
Merged by openshift-bot
2018-09-17 00:02:04 -04:00
liangxia
d431bff05e Update example repos that were moved to sclorg 2018-09-17 11:21:22 +08:00
OpenShift Bot
ac6dc9858f Merge pull request #914 from adambkaplan/feature/dockerfile-chown
Merged by openshift-bot
2018-08-23 15:20:35 -04: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
OpenShift Bot
7b9adb2996 Merge pull request #913 from adambkaplan/feature/docker-rm-injects
Merged by openshift-bot
2018-08-17 10:07: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
OpenShift Bot
a6f9beadd2 Merge pull request #912 from adambkaplan/feature/s2i-dockerfile-updates
Merged by openshift-bot
2018-08-10 13:07:15 -04:00
Adam Kaplan
68e8414b3a Address flake in TestExtractTarStreamTimeout 2018-08-10 12:22:18 -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
OpenShift Bot
07504a741f Merge pull request #911 from adambkaplan/bugfix/inject-hang
Merged by openshift-bot
2018-07-30 14:12:56 -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
OpenShift Bot
bc5fa283a2 Merge pull request #910 from wozniakjan/issue892/build/keep_symlinks
Merged by openshift-bot
2018-07-26 11:37:51 -04:00
Jan Wozniak
783f9c4cf6 build: delete dead code 2018-07-26 13:12:30 +02:00
Jan Wozniak
c845115212 build: keep symlinks flag 2018-07-26 13:12:28 +02:00
OpenShift Bot
d2e7686fb7 Merge pull request #909 from gabemontero/update-gitignore-vscode-debugger
Merged by openshift-bot
2018-07-23 15:38:24 -04:00
gabemontero
d5456dbc7c update gitignore for vscode, vscode debug, metadata 2018-07-23 14:56:46 -04:00
OpenShift Bot
012c77ca17 Merge pull request #907 from adambkaplan/feature/increment-dockerfile
Merged by openshift-bot
2018-07-20 11:13:26 -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
OpenShift Bot
d1e7db8290 Merge pull request #908 from adambkaplan/feature/rm-flag-ref
Merged by openshift-bot
2018-07-18 17:13:01 -04:00
Adam Kaplan
f42ec7cbe0 doc RecursiveCopyError 2018-07-18 16:19:52 -04:00
Adam Kaplan
7dd678b60f Remove references to cli flags in errors
Fixes #880
2018-07-18 15:46:30 -04:00
OpenShift Bot
05a1be7c32 Merge pull request #905 from bparees/recurse
Merged by openshift-bot
2018-07-18 10:49:17 -04:00
Ben Parees
d56b9e8b17 disallow copies to target into the source dir of the copy 2018-07-18 10:13:24 -04:00
OpenShift Bot
7e7ccdc890 Merge pull request #906 from bparees/git
Merged by openshift-bot
2018-07-18 09:45:05 -04:00
Ben Parees
e28a214c9f clarify git clone behavior 2018-07-17 17:52:04 -04:00
OpenShift Bot
a02a8c36fa Merge pull request #901 from bparees/workingdir
Merged by openshift-bot
2018-07-05 15:29:30 -04:00
Ben Parees
a81e9802b9 ensure workingdir is never empty 2018-07-05 13:07:24 -04:00
OpenShift Bot
05cadb936e Merge pull request #899 from joyrex2001/master
Merged by openshift-bot
2018-06-29 09:12:19 -04:00
Vincent van Dam
b08d94a374 Improve cross-platform compatibility in generated test script 2018-06-29 14:02:28 +02:00
OpenShift Bot
a0e5343a82 Merge pull request #898 from bparees/image
Merged by openshift-bot
2018-06-27 16:07:17 -04:00
Ben Parees
ab7a0b064e do not do image lookup when doing dockerfile output build 2018-06-27 10:43:29 -04:00
OpenShift Bot
bbc51f8b65 Merge pull request #890 from adambkaplan/feature/constants
Merged by openshift-bot
2018-06-21 21:06:48 -04:00
Adam Kaplan
9b55f54e76 api/constants package
Moved docker labels, s2i scripts, and deprecated env var constants
to it's own package.

Fixes #882
2018-06-21 08:49:12 -04:00
OpenShift Bot
d5e8a4aecd Merge pull request #895 from bparees/travis
Merged by openshift-bot
2018-06-18 15:19:20 -04:00
OpenShift Bot
eeb3df6c06 Merge pull request #894 from bparees/sample
Merged by openshift-bot
2018-06-18 14:48:35 -04:00
Ben Parees
21b3891a88 add godoc to make govet happy 2018-06-18 14:33:08 -04:00
Ben Parees
f03201f491 fix image repository name 2018-06-18 14:18:16 -04:00
OpenShift Bot
541bb23187 Merge pull request #891 from adambkaplan/feature/update-cli-docs
Merged by openshift-bot
2018-06-13 13:16:25 -04:00
Adam Kaplan
97b5a80774 Update build flags in cli doc 2018-06-13 12:26:17 -04:00
OpenShift Bot
1da6a9e2a0 Merge pull request #879 from adambkaplan/bugfix/assemble-user-bug
Merged by openshift-bot
2018-05-29 15:55:14 -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
OpenShift Bot
78a76d9704 Merge pull request #878 from bparees/dockerfile
Merged by openshift-bot
v1.1.11
2018-05-25 11:04:40 -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
OpenShift Bot
27f0729d81 Merge pull request #866 from adambkaplan/feature/build-configmaps
Merged by openshift-bot
v1.1.10
2018-05-03 18:37:00 -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
OpenShift Bot
8b93fdad29 Merge pull request #874 from adambkaplan/bugfix/url-logging
Merged by openshift-bot
2018-05-01 14:15:33 -04:00
OpenShift Bot
ffd9e0cce1 Merge pull request #873 from adambkaplan/bugfix/semicolon-issue
Merged by openshift-bot
2018-05-01 13:49:47 -04:00