3073 Commits

Author SHA1 Message Date
9644802cd7 Merge pull request #2279 from giuseppe/pts-no-override-if-not-needed
rootless: do not override /dev/pts if not needed
2019-02-06 20:28:15 +01:00
e0c3af6523 Generate make helping message dynamicaly.
Generate make helping message dynamicaly by using
python code snippet inside Makefile.

All commented make targets will be added to the
help message. To be added to the helping message
comment need to start with '## '.

These specials comments are detected by the python code.
Python code generate the helping output from these results.

Notice that this commit introduce a dependency with python (compatible python 2 and 3).

Signed-off-by: Hervé Beraud <hberaud@redhat.com>
2019-02-06 20:15:53 +01:00
aa881a0c71 Makefile: minor fix to reenable system tests
PR #2259 removed the .install.gomega Makefile target but
didn't clean up two references to it. Do so now.

Also, when setting up GOPKGBASEDIR symlink, use -f (force)
flag; otherwise subsequent makes will fail.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-02-06 12:04:21 -07:00
aa62843670 Merge pull request #2282 from nalind/healthconfig-startperiod
Add StartPeriod to cmd/podman/docker.HealthConfig
2019-02-06 19:41:17 +01:00
23a83af9d1 Add StartPeriod to cmd/podman/docker.HealthConfig
Backport the addition of the StartPeriod field to our copy of the
HealthConfig type, added in docker v17.05.0-ce.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-02-06 11:14:34 -05:00
33845f8a0f Unconditionally refresh storage options from config
Due to our unconditionally setting some storage options, we
are not always reading storage options from storage.conf. This
can lead to some fields in the storage config (most notably extra
storage options) being ignored, despite being set in
storage.conf.

Resolve this by unconditionally refreshing our storage config
from storage.conf (this was previously only done for rootless
Podman)

Fixes #2217

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-02-06 10:01:43 -05:00
e2970ea62d rootless: do not override /dev/pts if not needed
when running in rootless mode we were unconditionally overriding
/dev/pts to take ride of gid=5.  This is not needed when multiple gids
are present in the namespace, which is always the case except when
running the tests suite with only one mapping.  So change it to check
how many gids are present before overriding the default mount.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-02-06 15:31:20 +01:00
3416bb20f2 Fix handling of memory limits via varlink
Currently handlin memory via varlink is hard coded to 0
Changing to
			Memory:            create.Resources.Memory,
			MemoryReservation: create.Resources.Memory_reservation,
			MemorySwap:        create.Resources.Memory_swap,
			MemorySwappiness:  int(create.Resources.Memory_swappiness),
			KernelMemory:      create.Resources.Kernel_memory,
Allows callers to modify these memory settings.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-02-06 06:22:13 -08:00
1dd7bd0d0f Add documentation on running systemd on SELinux systems
Lots of users are attempting to run systemd within a container.  They are
being blocked from running SELinux systems since they need the
container_manage_cgroup which is not enabled by default.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-02-06 05:52:39 -08:00
ca6ab2029c Merge pull request #2275 from edsantiago/fix_blocking_fifo
e2e tests: sigproxy: fix rare hang condition
2019-02-06 14:00:49 +01:00
a9f75bf87b Merge pull request #2273 from mheon/preserve_exited_state
Preserve exited state across reboot
2019-02-06 14:00:43 +01:00
e249966e72 Merge pull request #2270 from cevich/fail_faster
Apply 45min timeout to integration tests
2019-02-06 14:00:38 +01:00
d321c5d942 Merge pull request #2259 from vrothberg/vendor-check
Vendor check
2019-02-06 13:42:47 +01:00
9ac0ebb079 Cirrus: add vendor_check_task
* Make sure that all vendored dependencies are in sync with the code and
  the vendor.conf by running `make vendor` with a follow-up status check
  of the git tree.

* Vendor ginkgo and gomega to include the test dependencies.

Signed-off-by: Chris Evic <cevich@redhat.com>
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-02-06 11:14:06 +01:00
51714d5da7 cleanup vendor directory
Remove some unused files in ./vendor via `make vendor`.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-02-06 11:14:06 +01:00
ffbded5dde Revert "Vendor containers/buildah"
This reverts commit edf16be28dd4f6bd6ce9a60de0b0114415dc4f9a as it's
not adding all changes from the used buildah commit.  Adding all
breaks the build as libpod is not yet using cobra.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-02-06 11:14:06 +01:00
314e1a9c5a Merge pull request #2267 from giuseppe/allow-override-oci-runtime
tests: allow to override the OCI runtime
2019-02-06 07:49:07 +01:00
7ee8fe86c1 e2e tests: sigproxy: fix rare hang condition
The sig-proxy test creates a FIFO, runs podman with actions
that write to it, then tries reading from the FIFO.

Opening a FIFO for read or write blocks until the other end is
opened for the corresponding write/read. If our podman process
fails for any reason, the test's FIFO open will hang forever.

Solution: open with O_NONBLOCK.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-02-05 14:10:49 -07:00
3c52accbc9 Preserve exited state across reboot
Instead of unconditionally resetting to ContainerStateConfigured
after a reboot, allow containers in the Exited state to remain
there, preserving their exit code in podman ps after a reboot.

This does not affect the ability to use and restart containers
after a reboot, as the Exited state can be used (mostly)
interchangeably with Configured for starting and managing
containers.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-02-05 15:37:56 -05:00
ede38d3600 Apply 50min timeout to integration tests
IMHO, longer than this waiting for automated testing is "too long".

Scientificaly speaking, based on thousands of runs across many
platforms, successful runs always happen in less time.  Normally
Ubuntu passes in 35-40 minutes, and the Fedoras do it in 25-30.

If they take longer, something is likely badly broken.  In that
case, it's better to fail within a short/defined time, than wait
for the (much longer) automation-level timeout and inevitable
failure.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-02-05 13:54:48 -05:00
0830bb9035 Capatilize all usage and descriptions
We have no consistancy in out option usages and descritions
on whether or not the first letter should be capatalized.

This patch forces them all to be capatilized.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-02-05 10:42:04 -08:00
74d984e056 Add podman system prune and info commands
We are missing the equivalence of the docker system commands

This patch set adds `podman system prune`
and `podman system info`

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-02-05 10:41:55 -08:00
650e242aa9 Merge pull request #2227 from baude/remoteexport
podman-remote import|export
2019-02-05 19:33:06 +01:00
64c8fb7c24 podman-remote import|export
addition of import and export for the podman-remote client.  This includes
the ability to send and receive files between the remote-client and the
"podman" host using an upgraded varlink connection.

Signed-off-by: baude <bbaude@redhat.com>
2019-02-05 10:05:41 -06:00
3554bfce98 Merge pull request #2196 from baude/toolbox
Changes to container runlabel for toolbox project
2019-02-05 10:34:40 -05:00
f30a531de1 Merge pull request #2262 from umohnani8/vendor
Vendor containers/buildah
2019-02-05 10:26:06 -05:00
80b75d299e tests: allow to override the OCI runtime
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-02-05 15:35:50 +01:00
b1d4dbd335 Merge pull request #2222 from giuseppe/rootless-copy-paths-global-conf
rootless: copy some settings from the global configuration
2019-02-05 13:15:20 +01:00
61979d8ac2 rootless: copy some settings from the global configuration
if some paths are overriden in the global configuration file, be sure
that rootless podman honors them.

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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-02-05 11:37:33 +01:00
778f9867fd Merge pull request #2253 from kunalkushwaha/quick-dockerfile-build
Reduce Dockerfile based build time for libpod.
2019-02-04 23:05:19 +01:00
0138430e10 Merge pull request #2263 from cevich/longer_info_wait
Increase e2e info/json test exit timeout
2019-02-04 21:09:45 +01:00
edf16be28d Vendor containers/buildah
Pull in fixes to build for single and two line Dockerfiles.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
2019-02-04 13:48:37 -05:00
465e19b555 Merge pull request #2213 from cevich/cirrus_imgts_container
[skip ci] Cirrus: Container for tracking image use
2019-02-04 19:18:10 +01:00
b7d052ee5e Increase e2e info/json test exit timeout
For whatever reason, this specific test frequently fails on Ubuntu with
an error similar to:

```
  Timed out after 1.000s.
  Expected process to exit.  It did not.

  /var/tmp/go/src/github.com/containers/libpod/test/e2e/info_test.go:38
```

Ths changes alters the test behavior to use the `defaultWaitTimeout`
value (so 90 vs former 60 seconds) only for this test.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-02-04 11:17:41 -05:00
d5593b8e71 Merge pull request #2233 from TomSweeneyRedHat/dev/tsweeney/trusty
Touch up image-trust man
2019-02-02 22:20:33 +01:00
3ee35b10a8 Merge pull request #2235 from TomSweeneyRedHat/dev/tsweeney/podmandescription
Rework Podman description
2019-02-02 21:56:15 +01:00
bae483c496 Touch up image-trust man
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>

In #1899, @rhatdan asked me to try and tweak the verbiage
a bit in the podman-images-trust man page.  I've done so,
or attempted to, and have also added a policy-json(5) link.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2019-02-02 15:03:17 -05:00
b58b95b408 Rework Podman description
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>

Rework the Podman Description.  I'm starting off with the Podman man page
to build consensus and we can then add to other places as appropriate.

This partially addresses: #1636

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2019-02-01 13:44:41 -05:00
e6426af30b Merge pull request #2251 from wking/image-inspect-repo-digests
libpod/image: Use RepoDigests() in Inspect()
2019-02-01 18:28:53 +01:00
b1dd595655 Merge pull request #2255 from vrothberg/vendor-containers-image
vendor latest containers/image
2019-02-01 17:44:20 +01:00
8e79420489 Merge pull request #2143 from QiWang19/continue2108
Fix up `image sign` in PR 2108
2019-02-01 17:12:50 +01:00
35c2a3a62a vendor latest containers/image
* make docker destination threadsafe
* use copy progress bars only when the fd points to a tty

Please note that this is not a release over containers/image. For an
upcoming release of libpod, we might consider vendoring the latest
release of containers/image.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-02-01 15:59:43 +01:00
d98e482ba3 Merge pull request #2239 from bodunov/master
Consistency in verbs in podman help command
2019-02-01 15:58:36 +01:00
e97dc8e061 Merge pull request #2249 from rhatdan/master
add Pod Manager References
2019-02-01 04:06:00 +01:00
5eb6fbe1c2 Reduce Dockerfile based build time for libpod.
libpod code added at end of Dockerfile, avoids
git clone of other packages in Dockerfile on subsequent builds.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2019-02-01 11:36:52 +09:00
f0d64a9e3e Merge pull request #2236 from baude/listcontainermountsmap
Alter varlink API for ListContainerMounts to return a map
2019-02-01 03:23:34 +01:00
e133834f6d Merge pull request #2232 from baude/pstable
Fix regression in ps with custom format
2019-02-01 03:23:29 +01:00
82550ede36 Merge pull request #2195 from cevich/rhel7-testing
Cirrus: Add RHEL-7 testing
2019-02-01 03:23:24 +01:00
40943586d2 libpod/image: Use RepoDigests() in Inspect()
To get the more-robust handling from 0f6535cf (libpod/image: Use
ParseNormalizedNamed in RepoDigests, 2019-01-08, #2106) here too.

Signed-off-by: W. Trevor King <wking@tremily.us>
2019-01-31 11:01:19 -08:00
1a34eb25e6 add Pod Manager References
Just to clarify where the name came from. We also now manage
volumes so add that to the description.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-01-31 09:27:43 +00:00