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

1677 Commits

Author SHA1 Message Date
Matej Vasek
73fe5b59e1 fix: honor --exclude when using --as-dockerfile
Signed-off-by: Matej Vasek <mvasek@redhat.com>
2023-03-09 19:53:07 +01:00
Matej Vasek
a2855300cd refactor: Copy() takes a predicate not a set
Predicate is more universal than a set (Go map).

Signed-off-by: Matej Vasek <mvasek@redhat.com>
2023-03-09 19:51:01 +01:00
Corey Daley
78363eee76 Merge pull request #1101 from coreydaley/update_release_for_go1.18
Updating release code to use go1.18
v1.3.2
2022-12-14 10:05:30 -05:00
Corey Daley
3944af65f2 Updating release code to use go1.18 2022-12-13 22:17:49 -05:00
OpenShift Merge Robot
1a45fe613e Merge pull request #1100 from yselkowitz/gomod
Update dependencies
2022-12-09 20:27:08 -05:00
Yaakov Selkowitz
058c5f27d6 Update dependencies 2022-12-07 15:52:50 -05:00
OpenShift Merge Robot
a1dbe56ef4 Merge pull request #1099 from yselkowitz/git-cve-2022-39253
Fix tests after git CVE-2022-39253 fix
2022-12-07 12:21:07 -05:00
Yaakov Selkowitz
f691c81e62 Fix tests after git CVE-2022-39253 fix 2022-11-20 11:56:22 -05:00
openshift-ci[bot]
a364722d1d Merge pull request #1093 from coreydaley/patch-1
Update builder_image.md
2022-07-08 21:16:09 +00:00
Corey Daley
c8dd2dc2cc Update builder_image.md 2022-07-08 16:58:34 -04:00
openshift-ci[bot]
bf32af469c Merge pull request #1092 from nalind/readme-install
BUILD-486: update installation instructions to use `go install`
2022-07-07 16:08:22 +00:00
Nalin Dahyabhai
81bf759032 Update installation instructions to use go install
Update instructions to use `go install` instead of `go get` to have Go
do all of the work of installing the current version of the code.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-07-07 10:27:27 -04:00
openshift-ci[bot]
5d16780746 Merge pull request #1090 from nalind/go-1.18
BUILD-485: Update dependencies; update to Go 1.18
2022-07-07 12:53:22 +00:00
Nalin Dahyabhai
ebacea9f3e Fix integration test invocation
Stop clearing S2I_BUILD_TAGS in hack/test-go.sh so that integration
tests will run when it's invoked from hack/test-dockerfile.sh and from
hack/docker.sh.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-06-29 15:59:35 -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
46b21861b8 Add unit tests for pkg/docker.GetAssembleUser()
Add unit tests for pkg/docker.GetAssembleUser(), and tweak its logic so
that it returns the image's default user instead of an empty string when
the image doesn't have a configured assemble user.

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
759107145a Update generated shell completion configurations
Run hack/update-generated-completions.sh to update
contrib/completions/bash/s2i and contrib/completions/zsh/s2i, flagged as
necessary by the verify job in CI.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-06-29 15:58:57 -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
Nalin Dahyabhai
331ea6eb5b Update dependencies; update to Go 1.18
* Update our module definition to use Go 1.18.
* Update our direct dependencies.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-06-29 15:51:47 -04:00
OpenShift Merge Robot
4feceb7626 Merge pull request #1089 from coreydaley/add_coreydaley_to_approvers
Add user coreydaley as an approver
2022-05-16 21:19:58 +02:00
Corey Daley
8835f63106 Add user coreydaley as an approver 2022-05-16 14:47:57 -04:00
OpenShift Merge Robot
11b93c276d Merge pull request #1080 from tmds/arm64
Add {linux,darwin}/aarch64 to cross-compile platforms.
2021-11-24 21:10:32 +01:00
Tom Deseyn
ae227b3792 Add {linux,darwin}/aarch64 to cross-compile platforms. 2021-11-10 14:01:16 +01:00
OpenShift Merge Robot
0a57243e7f Merge pull request #1079 from nalind/sti-user-group
Strip groups before checking if AssembleUser is Allowed
2021-11-09 23:45:28 +01:00
Nalin Dahyabhai
aa690147cc Strip groups before checking if AssembleUser is Allowed
When checking if the user that we'll use for running the assemble step
is in the allowed user range, we strip any potential group part from the
value for the user that we extract from the image's configuration before
checking if it's in the allowed range, but we haven't been doing that
for values configured through the "s2i.assemble-user" label.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2021-11-09 16:39:01 -05:00
OpenShift Merge Robot
48a9c056cf Merge pull request #1075 from NautiluX/patch-1
Update README.md
2021-10-18 15:18:46 +02:00
Manuel Dewald
fcacdb07b2 Update README.md 2021-10-18 14:51:30 +02:00
OpenShift Merge Robot
31e63d72bb Merge pull request #1072 from seeker25/windows_ignore_path_fix
Windows ignore path fix
2021-10-13 21:10:15 +02:00
OpenShift Merge Robot
cc5438d25d Merge pull request #1073 from gabemontero/fix-stirunimage
eol php 5.5 image no longer functional so move off of it in cmd line tests
2021-10-13 20:40:12 +02:00
gabemontero
24fd77722e eol php 5.5 image no longer functional so move off of it in cmd line tests 2021-10-13 13:39:40 -04:00
Travis Semple
6d698a3701 Merge branch 'openshift:master' into windows_ignore_path_fix 2021-10-12 16:22:38 -07:00
OpenShift Merge Robot
30aa3ffabc Merge pull request #1070 from gabemontero/revert-scp-ssh
Bug 1971332: revert incorrect allowance of ssh:// prefix with scp styled URLs
2021-07-22 09:37:24 -04:00
gabemontero
4f4cb8b11f revert incorrect allowance of ssh:// prefix with scp styled URLs 2021-07-19 16:10:59 -04:00
OpenShift Merge Robot
50f0f4feab Merge pull request #1069 from coreydaley/removing_travis_ci
Disable Travis CI by removing the .travis.yml file
2021-07-12 15:01:55 -04:00
OpenShift Merge Robot
a5a9da729a Merge pull request #1068 from gabemontero/fix-script-url-from-label-build-as-dockerfile
update script url from builder image labels with s2i build --as-dockerfile
2021-07-02 16:44:05 -04:00
Corey Daley
6abec9f4fc removing travis ci 2021-07-02 16:15:55 -04:00
gabemontero
ed1f0ecedc update script url from builder image labels with s2i build --as-dockerfile 2021-07-02 15:50:15 -04:00
gabemontero
12a00f2b74 update php image used in test-stirunner.sh 2021-06-29 15:30:30 -04:00
OpenShift Merge Robot
30d81a9440 Merge pull request #1057 from dAnjou/fix-1056
Fix instruction in s2i create README template
2020-10-12 11:39:26 -04:00
Max Ludwig
9310b6889b Fix instruction in s2i create README template
Fixes #1056.
2020-10-10 21:47:40 +02:00
OpenShift Merge Robot
a5a771479f Merge pull request #1055 from adambkaplan/release-vol-mount
Use volume mount in release build
v1.3.1
2020-10-09 14:14:08 -04:00
Adam Kaplan
af408da20a Use volume mount in release build
- Use bind mount instead of tar stream to add source code to the release
  container.
- Update release Dockerfile to declare volume for the s2i source.
  Command updated to remove tar stream in
- Add sti-version-defs file to .gitignore
2020-10-09 13:56:15 -04:00
OpenShift Merge Robot
8fdb399575 Merge pull request #1054 from gabemontero/scp-styled-ssh-git-uri
Bug 1884270: bypass golang url parsing with scp styled ssh git URLs; refactor URL for older git clients
2020-10-06 16:09:01 -04:00
gabemontero
129c90e36f Bug 1884270: bypass golang url parsing with scp styled ssh git URLs; refactor URL for older git clients 2020-10-06 15:05:21 -04:00
OpenShift Merge Robot
2ed02f2351 Merge pull request #1053 from coreydaley-redhat/update_klog_v2
Update klog v2
2020-10-02 11:20:55 -04:00
Corey Daley
8ca83f8ce1 code changes for k8s.io/klog/v2 2020-10-01 20:59:50 -04:00
Corey Daley
aa7e3310e9 updating to k8s.io/klog/v2 2020-10-01 20:59:35 -04:00
Travis Semple
0b4cb63090 Path fix for CopyContents, the ignore files use filepath, this probably should too.
Untested on linux.
2020-09-22 16:49:34 -07:00
OpenShift Merge Robot
b8a480489b Merge pull request #1050 from adambkaplan/go-mod-fixes
bump(*): make project go-gettable with go modules
2020-09-16 19:53:11 +02:00