Commit Graph

2857 Commits

Author SHA1 Message Date
Daniel J Walsh
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
OpenShift Merge Robot
d321c5d942 Merge pull request #2259 from vrothberg/vendor-check
Vendor check
2019-02-06 13:42:47 +01:00
Valentin Rothberg
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
Valentin Rothberg
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
Valentin Rothberg
ffbded5dde Revert "Vendor containers/buildah"
This reverts commit edf16be28d 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
OpenShift Merge Robot
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
OpenShift Merge Robot
650e242aa9 Merge pull request #2227 from baude/remoteexport
podman-remote import|export
2019-02-05 19:33:06 +01:00
baude
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
Daniel J Walsh
3554bfce98 Merge pull request #2196 from baude/toolbox
Changes to container runlabel for toolbox project
2019-02-05 10:34:40 -05:00
Daniel J Walsh
f30a531de1 Merge pull request #2262 from umohnani8/vendor
Vendor containers/buildah
2019-02-05 10:26:06 -05:00
Giuseppe Scrivano
80b75d299e tests: allow to override the OCI runtime
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-02-05 15:35:50 +01:00
OpenShift Merge Robot
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
Giuseppe Scrivano
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
OpenShift Merge Robot
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
OpenShift Merge Robot
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
Urvashi Mohnani
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
OpenShift Merge Robot
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
Chris Evich
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
OpenShift Merge Robot
d5593b8e71 Merge pull request #2233 from TomSweeneyRedHat/dev/tsweeney/trusty
Touch up image-trust man
2019-02-02 22:20:33 +01:00
OpenShift Merge Robot
3ee35b10a8 Merge pull request #2235 from TomSweeneyRedHat/dev/tsweeney/podmandescription
Rework Podman description
2019-02-02 21:56:15 +01:00
TomSweeneyRedHat
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
TomSweeneyRedHat
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
OpenShift Merge Robot
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
OpenShift Merge Robot
b1dd595655 Merge pull request #2255 from vrothberg/vendor-containers-image
vendor latest containers/image
2019-02-01 17:44:20 +01:00
OpenShift Merge Robot
8e79420489 Merge pull request #2143 from QiWang19/continue2108
Fix up `image sign` in PR 2108
2019-02-01 17:12:50 +01:00
Valentin Rothberg
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
OpenShift Merge Robot
d98e482ba3 Merge pull request #2239 from bodunov/master
Consistency in verbs in podman help command
2019-02-01 15:58:36 +01:00
OpenShift Merge Robot
e97dc8e061 Merge pull request #2249 from rhatdan/master
add Pod Manager References
2019-02-01 04:06:00 +01:00
Kunal Kushwaha
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
OpenShift Merge Robot
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
OpenShift Merge Robot
e133834f6d Merge pull request #2232 from baude/pstable
Fix regression in ps with custom format
2019-02-01 03:23:29 +01:00
OpenShift Merge Robot
82550ede36 Merge pull request #2195 from cevich/rhel7-testing
Cirrus: Add RHEL-7 testing
2019-02-01 03:23:24 +01:00
W. Trevor King
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
Daniel J Walsh
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
OpenShift Merge Robot
805c6d997b Merge pull request #2244 from rhatdan/version
Add support for short option -f in podman version
2019-01-30 18:51:22 +01:00
OpenShift Merge Robot
d38da7b8be Merge pull request #2243 from rhatdan/size
Add support for short option -s in podman inspect
2019-01-30 18:51:12 +01:00
OpenShift Merge Robot
68858211ce Merge pull request #2242 from rhatdan/info
Add support for short option -f
2019-01-30 17:00:52 +01:00
Daniel J Walsh
2ed52c299f Add support for short option -f in podman version
docker version supports a short options -f for --format

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-01-30 15:41:52 +00:00
Daniel J Walsh
a05f3a49fd Add support for short option -s in podman inspect
docker inspect supports a short -s option for --size.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-01-30 15:31:19 +00:00
Daniel J Walsh
9e340da255 Add support for short option -f
docker info supports a short -f option for --format.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-01-30 15:28:15 +00:00
baude
735f0de633 Changes to container runlabel for toolbox project
The toolbox project would benefit from a few changes to more closely
resembe the original atomic cli project.  Changes made are:

* only pull image for container runlabel if the label exists in the image
* if a container image does not have the desired label, exit with non-zero

Signed-off-by: baude <bbaude@redhat.com>
2019-01-30 08:44:58 -06:00
baude
ca53122338 Fix regression in ps with custom format
Using the table keyword in go templating had regressed and was
no longer working.

Fixes: 2221

Signed-off-by: baude <bbaude@redhat.com>
2019-01-30 08:32:28 -06:00
Chris Evich
10d749b9a8 Set SELinux type on bin/podman after install
Different components of testing reference the podman binary differently.
While they are identical in content, their SELinux types are not the
same, depending on build location.  Avoid confusion and test failures
by always matching the bin/podman SELinux type to that of $BINDIR/podman
 **after** install.  This ensures even if the code or default contexts
change, a subsequent `make install` will re-match the SELinux type.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-01-30 08:26:49 -05:00
Chris Evich
8ca6706be0 Cirrus: Add RHEL-7 testing
Add necessary tweaks to base-image build/import process so that image
can successfully boot with networking enabled.  Build the base image and
update ``.cirrus.yml`` accordingly.

Also make a minor improvement to cache-image building to help save space in
GCP image storage.  Namely, instead of storing every produced image, export
them into google storage buckets w/ life-cycle enabled.  For production use,
they may be converted back into GCE images, otherwise they will expire after
a time.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-01-30 08:26:48 -05:00
Ivan Bodunov
918b73cd05 For consistency in usage output the verbs changed from 3rd person to 1st person.
Signed-off-by: Ivan Bodunov <ivan.bodunov@gmail.com>
2019-01-30 14:10:33 +02:00
OpenShift Merge Robot
b71088a01e Merge pull request #2230 from rhatdan/quiet
Make --quiet work in podman create/run
2019-01-30 12:05:19 +01:00
OpenShift Merge Robot
b01ec95bda Merge pull request #2225 from cevich/enable_apparmor
Cirrus: Enable AppArmor build and test
2019-01-30 11:23:05 +01:00
OpenShift Merge Robot
76019c31f5 Merge pull request #2205 from baude/prunelikedocker
podman image prune -- implement all flag
2019-01-30 10:41:10 +01:00
baude
656033ca96 podman image prune -- implement all flag
we now, by default, only prune dangling images.  if --all is passed, we
prune dangling images AND images that do not have an associated containers.

also went ahead and enabled the podman-remote image prune side of things.

Fixes: #2192

Signed-off-by: baude <bbaude@redhat.com>
2019-01-29 16:51:48 -06:00
baude
9e22fbf679 Alter varlink API for ListContainerMounts to return a map
We want to return a map of containermounts where the key is container
id and it points to the mountpath.

Issue #2215

Signed-off-by: baude <bbaude@redhat.com>
2019-01-29 16:47:27 -06:00