Commit graph

4401 commits

Author SHA1 Message Date
OpenShift Merge Robot 130f6cba8c
Merge pull request #3293 from mheon/add_test_for_play_kube
Add a test for 'podman play kube' to prevent regression
2019-06-11 18:48:25 +02:00
Matthew Heon f909b745ec Add --filename option to generate kube
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>
2019-06-11 11:26:46 -04:00
Ashley Cui 91ce129eab Fix podman-remote to user default username
Currently, you have to specify the username every time, rather than default like SSH does.

Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
2019-06-11 10:09:37 -04:00
Ed Santiago 9f49c1af46 Prohibit use of positional args with --import
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>
2019-06-11 06:53:03 -06:00
Ed Santiago bd0582dd34 BATS tests - get working again
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>
2019-06-11 06:53:03 -06:00
Daniel J Walsh 805d1d96fa
Accidently removed /run/lock from systemd mounts
This is blowing up systemd containers on Ubuntu.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-06-11 07:54:55 -04:00
Matthew Heon 53435d4d47 Add a test for 'podman play kube' to prevent regression
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-10 18:57:29 -04:00
OpenShift Merge Robot c93b8d6b02
Merge pull request #3240 from rhatdan/storageopts
When you change the storage driver we ignore the storage-options
2019-06-10 20:33:46 +02:00
OpenShift Merge Robot a89d013b12
Merge pull request #3283 from haircommander/logging-play-kube-hotfix
Set a default log driver if none is specified
2019-06-10 20:19:33 +02:00
OpenShift Merge Robot 013b897ace
Merge pull request #3254 from ashley-cui/standarddoc
Standardize Documentation
2019-06-10 19:45:31 +02:00
OpenShift Merge Robot 75a3c22486
Merge pull request #3237 from cevich/ci_contrib_doc
docs: Add CI section and links
2019-06-10 18:57:24 +02:00
Chris Evich 8baa897356
Cirrus: New images w/o buildah
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-06-10 12:56:12 -04:00
Chris Evich 1a9accb379
Remove source-built buildah from CI
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-06-10 12:54:42 -04:00
Ashley Cui 19e0928037 standardize documentation formatting
Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
2019-06-10 11:48:02 -04:00
OpenShift Merge Robot 901ac2cdd3
Merge pull request #3287 from TomSweeneyRedHat/dev/tsweeney/podmanimage3
Touchup upstream Dockerfile
2019-06-10 17:38:36 +02:00
OpenShift Merge Robot fcb7c14c5b
Merge pull request #3285 from CameronNemo/musl
Fix cgo includes for musl
2019-06-09 08:18:56 +02:00
TomSweeneyRedHat cdffb69493 Touchup upstream Dockerfile
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>
2019-06-08 21:31:46 -04:00
Peter Hunt 9313556591 only set log driver if it isn't empty
Now, not setting a log driver in a create config correctly takes the default (k8s-logging)

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-06-08 17:46:17 -04:00
Cameron Nemo 8d2c7c269d
Fix cgo includes for musl
closes #3284

Signed-off-by: Cameron Nemo <cnemo@tutanota.com>
2019-06-08 14:15:03 -07:00
OpenShift Merge Robot 39f5ea4c04
Merge pull request #3180 from mheon/inspect_volumes
Begin to break up pkg/inspect
2019-06-08 14:45:24 +02:00
OpenShift Merge Robot f6a2860b62
Merge pull request #3213 from juhp/patch-1
fix tutorial link to install.md
2019-06-08 12:51:57 +02:00
OpenShift Merge Robot 5646f13178
Merge pull request #3253 from cevich/clean_brent_mess
Cirrus: Minor cleanup of dependencies and docs
2019-06-08 12:35:57 +02:00
Daniel J Walsh 629017bb19
When you change the storage driver we ignore the storage-options
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>
2019-06-08 06:20:31 -04:00
Daniel J Walsh 6109de4b93
Update vendor on containers/storage to v1.12.10
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-06-08 06:20:31 -04:00
OpenShift Merge Robot cae5af5b93
Merge pull request #3276 from jwakely/patch-1
Fix spelling
2019-06-07 23:37:39 +02:00
OpenShift Merge Robot bfc544f7e8
Merge pull request #3279 from mheon/update_cstorage
Update c/storage to 9b10041d7b2ef767ce9c42b5862b6c51eeb82214
2019-06-07 23:06:25 +02:00
Matthew Heon 43dc5bb627
Merge pull request #3282 from mheon/bump-1.4.0
Bump to v1.4.0
2019-06-07 16:50:53 -04:00
Matthew Heon 7ce4036187 Bump gitvalidation epoch
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-07 16:49:51 -04:00
Matthew Heon 4bd0fcf561 Bump to v1.4.1-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-07 16:49:51 -04:00
Matthew Heon 41365a8f67 Bump to v1.4.0
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-07 16:49:48 -04:00
Matthew Heon 1f31892a9f
Merge pull request #3281 from mheon/release_notes_1.4.0_real
Update release notes for v1.4.0
2019-06-07 16:06:27 -04:00
Matthew Heon fe751a535b Update release notes for v1.4.0
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-07 16:05:21 -04:00
Matthew Heon 1f2da06199
Merge pull request #3280 from mheon/release_notes_1.4.0
Update release notes for v1.4.0
2019-06-07 15:57:14 -04:00
Matthew Heon d40b450afd Default 'pause' to false for 'podman cp'
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-07 15:17:40 -04:00
Matthew Heon b2283de0b8 Update release notes for v1.4.0
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-07 15:16:12 -04:00
Matthew Heon d81fc2e192 Update c/storage to 9b10041d7b2ef767ce9c42b5862b6c51eeb82214
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-07 15:11:38 -04:00
OpenShift Merge Robot bcc89e9d08
Merge pull request #3271 from giuseppe/rootless-skip-ns-resolution-on-old-kernels
rootless: skip NS_GET_PARENT on old kernels
2019-06-07 15:39:28 +02:00
OpenShift Merge Robot 346128792c
Merge pull request #2272 from adrianreber/migration
Add support to migrate containers
2019-06-07 14:33:20 +02:00
Jonathan Wakely bfd2483747 Fix spelling
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
2019-06-07 10:08:43 +01:00
Jens Petersen 0c3e3bebbb fix tutorial link to install.md
[skip ci]

Signed-off-by: Jens Petersen <petersen@redhat.com>
2019-06-07 06:16:47 +00:00
OpenShift Merge Robot ba36a5f446
Merge pull request #3268 from cevich/meta_track_repo
Cirrus: Track VM Image calling GCE project
2019-06-06 22:58:22 +02:00
Chris Evich ae16fa33d7
Cirrus: Minor cleanup of dependencies and docs
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-06-06 15:33:01 -04:00
OpenShift Merge Robot c5c73794b4
Merge pull request #3272 from mheon/skip_hc_flake
Disable a very badly flaking healthcheck test
2019-06-06 17:41:20 +02:00
Matthew Heon b2a8b725af Disable a very badly flaking healthcheck test
We'll reenable once the flake is fixed.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-06 10:55:57 -04:00
Giuseppe Scrivano 4dca13e704
rootless: skip NS_GET_PARENT on old kernels
on old kernels the ioctl NS_GET_PARENT is not available.

Handle the error code and immediately return the same fd.  It should
be fine now that we use the namespace resolution using the conmon pid,
so the namespace parent resolution is just a safety measure.

Closes: https://github.com/containers/libpod/issues/2968

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-06-06 15:32:45 +02:00
OpenShift Merge Robot 6d285b879c
Merge pull request #3256 from llchan/rootless-init-path
Inherit rootless init_path from system libpod.conf
2019-06-05 23:13:07 +02:00
Chris Evich 32fb83e3ab
Cirrus: Track VM Image calling GCE project
With multiple `containers` projects updating VM Image metadata,
it would be very difficult to discover which Cirrus-CI setup
was responsible.  Add the GCE project name to the list
of metadata labels to update when this container runs.  This
will give more context as to which images are currently in use.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-06-05 15:53:00 -04:00
OpenShift Merge Robot b1c9cb712d
Merge pull request #3265 from baude/noremotec
remove -c for podman remote global options
2019-06-05 16:03:27 +02:00
OpenShift Merge Robot 6832581484
Merge pull request #3259 from cevich/cull_f28
Cirrus: Disable testing on F28 (EOL)
2019-06-05 06:21:58 +02:00
baude 13a961a2cf remove -c for podman remote global options
it conflicts with commit

Signed-off-by: baude <bbaude@redhat.com>
2019-06-04 18:06:24 -05:00