Commit Graph

1904 Commits

Author SHA1 Message Date
OpenShift Merge Robot
6983e00a28 Merge pull request #1623 from mheon/static_ip
Add ability to specify static IPs with --ip flag
2018-10-11 10:40:37 -07:00
OpenShift Merge Robot
3c23bfca80 Merge pull request #1613 from mheon/log_netns_error
Log an otherwise ignored error from joining a net ns
2018-10-11 10:40:32 -07:00
OpenShift Merge Robot
92b68e802c Merge pull request #1621 from QiWang19/issue1615
Document --net as an alias of --network in podman run & create
2018-10-11 10:19:05 -07:00
OpenShift Merge Robot
b5f4bb15a5 Merge pull request #1607 from baude/runlabelfixes
fix runlabel functions based on QA feedback
2018-10-11 09:58:59 -07:00
OpenShift Merge Robot
9e1cdd56d4 Merge pull request #1620 from umohnani8/vendor
Vendor latest containers/image
2018-10-11 08:54:33 -07:00
Matthew Heon
a7318781c6 Log an otherwise ignored error from joining a net ns
Signed-off-by: Matthew Heon <mheon@redhat.com>
2018-10-11 11:29:42 -04:00
Matthew Heon
112e1402c9 Fix gofmt
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-11 11:24:08 -04:00
Matthew Heon
a54709129f Add tests for --ip flag
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-11 11:24:08 -04:00
Matthew Heon
d2de9cd3dc Update manpages for --ip flag
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-11 11:24:08 -04:00
Matthew Heon
4882a6dd9d Add --ip flag and plumbing into libpod
Add the --ip flag back with bash completions. Manpages still
missing.

Add plumbing to pass appropriate the appropriate option down to
libpod to connect the flag to backend logic added in the previous
commits.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-11 11:24:08 -04:00
Qi Wang
dd02559473 Document --net as an alias of --network in podman run & create
Signed-off-by: Qi Wang <qiwan@redhat.com>
2018-10-11 11:22:20 -04:00
Matthew Heon
b3cde231ab Update OCICNI vendor to 2d2983e4
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-11 11:10:23 -04:00
Matthew Heon
5c5163107c Temporary commit to swap branches
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-11 11:10:23 -04:00
Matthew Heon
6b80986194 Update OCICNI vendor to e617a611
Includes necessary changes for static IPs.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-11 11:08:55 -04:00
baude
255b56ae41 fix runlabel functions based on QA feedback
Signed-off-by: baude <bbaude@redhat.com>
2018-10-11 09:52:53 -05:00
Urvashi Mohnani
883df782f5 Vendor latest containers/image
Catches more errors when checking for login credentials.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
2018-10-11 10:40:22 -04:00
OpenShift Merge Robot
23c9816ba9 Merge pull request #1622 from baude/paprdind
Paprdind
2018-10-11 07:36:51 -07:00
baude
1c0247ceb4 wip
Signed-off-by: baude <bbaude@redhat.com>
2018-10-10 14:11:35 -05:00
Valentin Rothberg
08cab4ad3a remove hack/dind
The docker-in-docker was script was needed to run AppArmor tests in
Travis, which is not required anymore since Travis isn't being used
for a while.  Removing the script will also cure some hiccups on
some atomic testing nodes.

Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
2018-10-10 18:05:50 +02:00
OpenShift Merge Robot
71c2681310 Merge pull request #1587 from mheon/fix_pod_status
Fix pod status reporting for new Exited state
2018-10-08 11:09:28 -07:00
OpenShift Merge Robot
44b79917d5 Merge pull request #1600 from rhatdan/vendor
Vendor in latest github.com/containers/storage,image, buildah
2018-10-08 07:08:25 -07:00
Daniel J Walsh
3a76772bb1 Vendor in latest github.com/containers/storage,image, buildah
Grab latest fixes from subpackages

Including fixes for usernamespace chowning retaining file attributes
Better logging of error messages.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2018-10-07 08:29:23 -04:00
OpenShift Merge Robot
141a1327fb Merge pull request #1573 from baude/readdgolang
re-add BR for golang compiler to contrib/spec/podman.spec.in
2018-10-07 00:07:26 -07:00
OpenShift Merge Robot
d137b0908c Merge pull request #1598 from cevich/readd_verify
Lower Cirrus-CI CPU + Re-add verify step
2018-10-05 11:56:39 -07:00
OpenShift Merge Robot
20db511fdb Merge pull request #1597 from jtligon/master
added links to buildah.io and podman.io to README.md
2018-10-05 11:33:00 -07:00
OpenShift Merge Robot
260357cf8b Merge pull request #1594 from vrothberg/runlabel
runlabel: execute /proc/self/exe and avoid recursion
2018-10-05 11:19:48 -07:00
OpenShift Merge Robot
550270364b Merge pull request #1590 from baude/skipuserns
skip userns tests on non-fedora distributions for now
2018-10-05 10:35:29 -07:00
OpenShift Merge Robot
b8ad0ddccb Merge pull request #1595 from baude/remove_travis
Remove Travis
2018-10-05 10:11:38 -07:00
Valentin Rothberg
d4eca12cc1 runlabel: execute /proc/self/exe and avoid recursion
Execute /proc/self/exe instead of podman.  This makes the runlabel
command more portable as it works for binaries outside the path as
well as for local builds.

Also, avoid redundantly executing the runlabel command by setting
the PODMAN_RUNLABEL_NESTED environment variable to "1".  Podman
now checks for this variable before executing the runlabel command
and will throw an error in case the variable is set.

Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
2018-10-05 17:28:18 +02:00
Chris Evich
52f0547f64 Re-add source-verify in cirrus-ci
Don't waste GCE VM resources for 30-min of testing,
when verify would fail after 3-minutes.  This is
the simpelest mechanism to save cloud CPU-time
while GCE is under trial-status (can not set quotas).

Signed-off-by: Chris Evich <cevich@redhat.com>
2018-10-05 11:23:21 -04:00
jtligon
8887820e42 added links to buildah.io and podman.io to README.md
Signed-off-by: jtligon <jligon@redhat.com>
2018-10-05 11:23:00 -04:00
Chris Evich
eef2cb01ca Lower CPU/Memory usage by cirrus VMs
These can increase again, once we have more control over setting quotas
in GCE.  At the moment it's limited because of trial-account status.

Signed-off-by: Chris Evich <cevich@redhat.com>
2018-10-05 11:05:58 -04:00
OpenShift Merge Robot
f5df6f4a61 Merge pull request #1593 from pkubatrh/dq_docker
docker: Double quote array expansions to avoid re-splitting elements
2018-10-05 07:17:47 -07:00
OpenShift Merge Robot
879a2a8c38 Merge pull request #1537 from mheon/libnetwork_resolv
Switch to using libnetwork's resolvconf package
2018-10-05 06:54:48 -07:00
baude
cde1029151 skip userns tests on non-fedora distributions for now
Signed-off-by: baude <bbaude@redhat.com>
2018-10-05 08:48:41 -05:00
baude
8771a03af1 Remove Travis
Now that we are testing ubuntu-bionic on a VM, we no longer need
travis.

Signed-off-by: baude <bbaude@redhat.com>
2018-10-05 08:28:27 -05:00
OpenShift Merge Robot
a4a6f7dac2 Merge pull request #1518 from cevich/cirrus-ci
Add cirrus-ci: eventual replacement for papr and travis
2018-10-05 06:15:28 -07:00
Petr Kubat
8e54df5d91 docker: Double quote array expansions to avoid re-splitting elements
Signed-off-by: Petr Kubat <pkubat@redhat.com>
2018-10-05 11:00:27 +02:00
Matthew Heon
e9ab8583d0 Ensure resolv.conf has the right label and path
Adds a few missing things from writeStringToRundir() to the new
resolv.conf function, specifically relabelling and returning a
path compatible with rootless podman

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-04 17:38:09 -04:00
Matthew Heon
ae5af67d61 Remove no longer used libnetwork from vendor.conf
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-04 17:34:59 -04:00
Matthew Heon
2d332d01a7 Fix lint
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-04 17:34:59 -04:00
Matthew Heon
52de75501c Drop libnetwork vendor and move the code into pkg/
The vendoring issues with libnetwork were significant (it was
dragging in massive amounts of code) and were just not worth
spending the time to work through. Highly unlikely we'll ever end
up needing to update this code, so move it directly into pkg/ so
we don't need to vendor libnetwork. Make a few small changes to
remove the need for the remainder of libnetwork.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-04 17:34:59 -04:00
Matthew Heon
bc5fac3a7c Update libnetwork vendor to current master to fix CI
Avoid a Sirupsen vs sirupsen class for logrus by updating to
master.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-04 17:34:59 -04:00
Matthew Heon
e4ded6ce7f Switch to using libnetwork's resolvconf package
Libnetwork provides a well-tested package for generating
resolv.conf from the host's that has some features our current
implementation does not. Swap to using their code and remove our
built-in implementation.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
2018-10-04 17:34:59 -04:00
Chris Evich
c53163b75a Add configuration for Cirrus-CI
Testing podman requires exercising on a full-blown VM.  The current
containerized-approach is complicated, and mostly a band-aid over
shortcomings in the other CI systems.  Namely, we want:

* To pre-build environments with dependencies to reduce the
  setup time needed for testing.
* The ability to verify the pre-built environments are working
  before utilizing them for further testing.
* A simple, single set of flexible automation instructions to
  reduce maintenance burden.
* Ease of environment reproduction across clouds or locally, for
  debugging failures.

This change leverages Cirrus-CI + Packer + collection of shell scripts
to realize all of the above.

Signed-off-by: Chris Evich <cevich@redhat.com>
2018-10-04 16:30:48 -04:00
OpenShift Merge Robot
094b8b7350 Merge pull request #1570 from giuseppe/fix-gvisor
podman: allow usage of gVisor as OCI runtime
2018-10-04 13:24:57 -07:00
OpenShift Merge Robot
06a959f74a Merge pull request #469 from adrianreber/master
Add support to checkpoint/restore containers
2018-10-04 12:34:49 -07:00
OpenShift Merge Robot
3c31e176c7 Merge pull request #1557 from rhatdan/systemd
Don't tmpcopyup on systemd cgroup
2018-10-04 09:54:51 -07:00
Matthew Heon
7213ac81b0 Merge pull request #1591 from baude/disablecontainerbuildservice
disable gce building of images
2018-10-04 12:24:04 -04:00
baude
2c79b8e22e disable gce building of images
Signed-off-by: baude <bbaude@redhat.com>
2018-10-04 11:22:41 -05:00