summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Cirrus: Simplify log collection commandsChris Evich2019-06-14
| | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #3312 from mheon/podman_inspect_fixes_contOpenShift Merge Robot2019-06-13
|\ | | | | Further fixes for podman inspect
| * Split mount options in inspect furtherMatthew Heon2019-06-13
| | | | | | | | | | | | | | Docker only uses Mode for :z/:Z, so move other options out into a new field. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Make Inspect's mounts struct accurate to DockerMatthew Heon2019-06-12
| | | | | | | | | | | | | | | | | | | | | | We were formerly dumping spec.Mount structs, with no care as to whether it was user-generated or not - a relic of the very early days when we didn't know whether a user made a mount or not. Now that we do, match our output to Docker's dedicated mount struct. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Provide OCI spec path in `podman inspect` outputMatthew Heon2019-06-12
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #3319 from mheon/purge_easyjsonOpenShift Merge Robot2019-06-13
|\ \ | | | | | | Purge all use of easyjson and ffjson in libpod
| * | Purge all use of easyjson and ffjson in libpodMatthew Heon2019-06-13
| |/ | | | | | | | | | | | | | | | | We're no longer using either of these JSON libraries, dropped them in favor of jsoniter. We can't completely remove ffjson as c/storage uses it and can't easily migrate, but we can make sure that libpod itself isn't doing anything with them anymore. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #3311 from giuseppe/oci-errorsOpenShift Merge Robot2019-06-13
|\ \ | | | | | | oci: use json formatted errors from the runtime
| * | oci: allow to specify what runtimes support JSONGiuseppe Scrivano2019-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | add a new configuration `runtime_supports_json` to list what OCI runtimes support the --log-format=json option. If the runtime is not listed here, libpod will redirect stdout/stderr from the runtime process. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | oci: use json formatted errors from the runtimeGiuseppe Scrivano2019-06-13
|/ / | | | | | | | | | | | | request json formatted error messages from the OCI runtime so that we can nicely print them. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #3305 from giuseppe/slirp-dns-firstOpenShift Merge Robot2019-06-12
|\ \ | | | | | | rootless: use the slirp4netns builtin DNS first
| * | rootless: use the slirp4netns builtin DNS firstGiuseppe Scrivano2019-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | When using slirp4netns, be sure the built-in DNS server is the first one to be used. Closes: https://github.com/containers/libpod/issues/3277 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #3307 from rhatdan/126OpenShift Merge Robot2019-06-12
|\ \ \ | |/ / |/| | If container is not in correct state podman exec should exit with 126
| * | If container is not in correct state podman exec should exit with 126Daniel J Walsh2019-06-12
|/ / | | | | | | | | | | | | | | | | | | | | | | This way a tool can determine if the container exists or not, but is in the wrong state. Since 126 is documeted as: **_126_** if the **_contained command_** cannot be invoked It makes sense that the container would exit with this state. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #3298 from ashley-cui/usernameOpenShift Merge Robot2019-06-12
|\ \ | |/ |/| Fix podman-remote to user default username
| * Fix podman-remote to user default usernameAshley Cui2019-06-11
| | | | | | | | | | | | Currently, you have to specify the username every time, rather than default like SSH does. Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
* | Merge pull request #3261 from cevich/no_buildahOpenShift Merge Robot2019-06-11
|\ \ | | | | | | Remove source-built buildah from CI
| * | Cirrus: New images w/o buildahChris Evich2019-06-10
| | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | Remove source-built buildah from CIChris Evich2019-06-10
| | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #3290 from edsantiago/batsOpenShift Merge Robot2019-06-11
|\ \ \ | | | | | | | | BATS tests - get working again
| * | | Prohibit use of positional args with --importEd Santiago2019-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I took the liberty of combining related checks together so as to avoid a little duplication; if this is not a Go best practice, I will revert. I also made a minor wording adjustment to an error message for clarity. Also: update wording of man page. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | BATS tests - get working againEd Santiago2019-06-11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various small fixes to get BATS tests working again. Split from #2947 because that one keeps getting stalled, and I'm hoping these separate changes get approved. I consider these changes urgent because RHEL8 gating tests are failing, and will fail even more if/when #2272 gets picked up and packaged for RHEL8, and I consider it important to have clean passing tests for RHEL8. * info test: 'insecure registries' is gone. A recent commit (d1a7378aa) changed the format of 'podman info', removing the 'insecure registries' key. Deal with it. * info test: remove check for .host.{Conmon,OCIRuntime}.package; the value on f28 and f29 is 'Unknown' (instead of an NVR). We can live without this check. * 'load' test: skip when running in CI, because stdin is not a tty. * container restore: fix arg processing. #2272 broke argument processing: 'podman container restore', with no args, should exit with 'argument required' error. Root cause is that the new --import option takes the place of an argument, so the checkAllAndLatest() call had to be changed to not exit on error. Workaround is (sigh) to copy/paste the skipped checkAllAndLatest() code, with minor tweaks to accommodate --import. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #3293 from mheon/add_test_for_play_kubeOpenShift Merge Robot2019-06-11
|\ \ \ | |/ / |/| | Add a test for 'podman play kube' to prevent regression
| * | Add --filename option to generate kubeMatthew Heon2019-06-11
| | | | | | | | | | | | | | | | | | | | | | | | This allows writing output directly to a file, instead of STDOUT. Makes things easier for some scripting tasks. Like the unit tests for 'play kube'. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | Add a test for 'podman play kube' to prevent regressionMatthew Heon2019-06-10
| | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #3240 from rhatdan/storageoptsOpenShift Merge Robot2019-06-10
|\ \ \ | |/ / |/| | When you change the storage driver we ignore the storage-options
| * | When you change the storage driver we ignore the storage-optionsDaniel J Walsh2019-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The storage driver and the storage options in storage.conf should match, but if you change the storage driver via the command line then we need to nil out the default storage options from storage.conf. If the user wants to change the storage driver and use storage options, they need to specify them on the command line. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Update vendor on containers/storage to v1.12.10Daniel J Walsh2019-06-08
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #3283 from haircommander/logging-play-kube-hotfixOpenShift Merge Robot2019-06-10
|\ \ \ | | | | | | | | Set a default log driver if none is specified
| * | | only set log driver if it isn't emptyPeter Hunt2019-06-08
| | | | | | | | | | | | | | | | | | | | | | | | Now, not setting a log driver in a create config correctly takes the default (k8s-logging) Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | Merge pull request #3254 from ashley-cui/standarddocOpenShift Merge Robot2019-06-10
|\ \ \ \ | | | | | | | | | | Standardize Documentation
| * | | | standardize documentation formattingAshley Cui2019-06-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
* | | | | Merge pull request #3237 from cevich/ci_contrib_docOpenShift Merge Robot2019-06-10
|\ \ \ \ \ | |_|_|_|/ |/| | | | docs: Add CI section and links
| * | | | docs: Add CI section and linksChris Evich2019-05-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #3287 from TomSweeneyRedHat/dev/tsweeney/podmanimage3OpenShift Merge Robot2019-06-10
|\ \ \ \ \ | | | | | | | | | | | | Touchup upstream Dockerfile
| * | | | | Touchup upstream DockerfileTomSweeneyRedHat2019-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream/Dockerfile had a few issues that this cleans up. A few files were misplaced, wrong installs and removes. This corrects those issues. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | | Merge pull request #3285 from CameronNemo/muslOpenShift Merge Robot2019-06-09
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix cgo includes for musl
| * | | | | Fix cgo includes for muslCameron Nemo2019-06-08
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | closes #3284 Signed-off-by: Cameron Nemo <cnemo@tutanota.com>
* | | | | Merge pull request #3180 from mheon/inspect_volumesOpenShift Merge Robot2019-06-08
|\ \ \ \ \ | |_|_|/ / |/| | | | Begin to break up pkg/inspect
| * | | | Begin to break up pkg/inspectMatthew Heon2019-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's put inspect structs where they're actually being used. We originally made pkg/inspect to solve circular import issues. There are no more circular import issues. Image structs remain for now, I'm focusing on container inspect. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3213 from juhp/patch-1OpenShift Merge Robot2019-06-08
|\ \ \ \ \ | | | | | | | | | | | | fix tutorial link to install.md
| * | | | | fix tutorial link to install.mdJens Petersen2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci] Signed-off-by: Jens Petersen <petersen@redhat.com>
* | | | | | Merge pull request #3253 from cevich/clean_brent_messOpenShift Merge Robot2019-06-08
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Cirrus: Minor cleanup of dependencies and docs
| * | | | | Cirrus: Minor cleanup of dependencies and docsChris Evich2019-06-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | Merge pull request #3276 from jwakely/patch-1OpenShift Merge Robot2019-06-07
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix spelling
| * | | | | | Fix spellingJonathan Wakely2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
* | | | | | | Merge pull request #3279 from mheon/update_cstorageOpenShift Merge Robot2019-06-07
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update c/storage to 9b10041d7b2ef767ce9c42b5862b6c51eeb82214
| * | | | | | | Default 'pause' to false for 'podman cp'Matthew Heon2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | | Update c/storage to 9b10041d7b2ef767ce9c42b5862b6c51eeb82214Matthew Heon2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | | Merge pull request #3282 from mheon/bump-1.4.0Matthew Heon2019-06-07
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump to v1.4.0
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-26 17:27:34 +0000