Commit Graph

6854 Commits

Author SHA1 Message Date
OpenShift Merge Robot 9e12f6354c
Merge pull request #5395 from cevich/fix_fedora_minimal
Cirrus: Fix fedora-minimal mirroring
2020-03-08 15:55:03 +01:00
OpenShift Merge Robot 3818146335
Merge pull request #5407 from rhatdan/codespell
Fix spelling mistakes in code found by codespell
2020-03-07 22:12:27 +01:00
Daniel J Walsh ac354ac94a
Fix spelling mistakes in code found by codespell
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-07 10:30:44 -05:00
OpenShift Merge Robot c8de26fb08
Merge pull request #5374 from baude/create
add default network for apiv2 create
2020-03-07 14:16:43 +01:00
OpenShift Merge Robot 43bf4f6626
Merge pull request #5359 from TomSweeneyRedHat/dev/tsweeney/fixquay
Fix upstream dockerfile and add 'by hand' ctrfile
2020-03-07 14:14:13 +01:00
OpenShift Merge Robot b92a9090ed
Merge pull request #5417 from mheon/bump-1.8.1-rc3
[CI:DOCS] Bump to v1.8.1-RC3
2020-03-06 23:28:11 +01:00
Brent Baude 8b5e2a6297 add default network for apiv2 create
during container creation, if no network is provided, we need to add a default value so the container can be later started.

use apiv2 container creation for RunTopContainer instead of an exec to the system podman. RunTopContainer now also returns the container id and an error.

added a libpod commit endpoint.

also, changed the use of the connections and bindings slightly to make it more convenient to write tests.

Fixes: 5366
Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-03-06 14:31:45 -06:00
Matthew Heon e9a58ccfae Bump to v1.8.1-dev
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-03-06 15:26:32 -05:00
Matthew Heon e5f7cb3978 Bump to v1.8.1-rc3
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-03-06 15:26:31 -05:00
OpenShift Merge Robot c3177b781b
Merge pull request #5410 from st1971/api-fixes
APIv2: compatible api fixes
2020-03-06 21:19:55 +01:00
OpenShift Merge Robot 6365fab22b
Merge pull request #5415 from mheon/release_notes_181_rc3
[CI:DOCS] Update release notes for v1.8.1-RC3
2020-03-06 21:17:18 +01:00
Matthew Heon fbbe6099f5 Update release notes for v1.8.1-RC3
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-03-06 14:50:09 -05:00
OpenShift Merge Robot a61d05f667
Merge pull request #5387 from edsantiago/try_renaming_long_cirrus_jobs
Rename long cirrus job names
2020-03-06 20:10:51 +01:00
OpenShift Merge Robot b0d350a1bd
Merge pull request #5414 from dcbw/cni-0.7.2-snapshot
vendor: update github.com/containernetworking/cni to v0.7.2-0.20200304161608-4fae32b84921
2020-03-06 18:48:02 +01:00
Ed Santiago a61ff4972d Part 2: try to clean up the long image instance names
Let's try to shorten up fedora-31-libpod-123456789etc to
just fedora-31.

While we're at it, shorten the window/darwin names too

Many many thanks to @fkorotkov for the suggestion to use 'alias'

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-03-06 09:17:05 -07:00
Ed Santiago 68b0b20607 WIP: Try renaming long cirrus job names
Basically, add a 'name' tag (remote, local) to each incantation
of TEST_REMOTE_CLIENT: true/false

I have no idea if this will work or what results it'll produce.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-03-06 09:17:05 -07:00
Dan Williams 74ddc0b696 vendor: update github.com/containernetworking/cni to v0.7.2-0.20200304161608-4fae32b84921
Specifically to get:

https://github.com/containernetworking/cni/pull/735
6f29b0165883b2b52ccd4dcb937162ea4c86927b intercept netplugin std err

But also pulls in some interface name validation and a compatibility
fix for configurations that don't set a CNI version.

Signed-off-by: Dan Williams <dcbw@redhat.com>
2020-03-06 10:03:27 -06:00
Daniel J Walsh cb51707f91
Allow users to set TMPDIR environment
Some users have small /var/tmp directories and need to be able to specify a different location
for temporary files, which includes more space.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-06 10:21:37 -05:00
Steve Taylor 06f5664e9d Removed extraneous comments and defaults plus amended variable declaration
Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
2020-03-06 13:19:21 +00:00
Steve Taylor 920d09c174 Removed the unnecessary code
removed defaulting of  query.Size
amended types.LibpodToContainer, removed hard coded true from inspect call

Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
2020-03-06 13:17:56 +00:00
OpenShift Merge Robot f07e18f05c
Merge pull request #5408 from vrothberg/goimports
golangci: enable goimports
2020-03-06 14:16:56 +01:00
Steve Taylor 83e52cf787 Implemented size parameter on GetContainer
Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
2020-03-05 23:02:45 +00:00
Steve Taylor da15f2f881 Implement size parameter on ListContainers
Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
2020-03-05 22:53:50 +00:00
Steve Taylor 1ef96364fe Map configured status to created to match docker API states
Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
2020-03-05 22:47:11 +00:00
Steve Taylor 9088a8a387 Fix to remove null entry from end of images json
Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
2020-03-05 22:37:31 +00:00
Steve Taylor 89b083f8b4 Register handlers without version to align with docker API
Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
2020-03-05 22:28:22 +00:00
Valentin Rothberg 593eb7625a golangci: enable goimports
Enable the goimports linter and fix reports.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-03-05 20:03:44 +01:00
OpenShift Merge Robot 60e9e7ca9c
Merge pull request #5039 from cevich/fix_gobin_exit_bug
Cirrus: Fix gate image & false-positive exits
2020-03-05 19:28:10 +01:00
OpenShift Merge Robot 3626028640
Merge pull request #5400 from vrothberg/systemd-gen-cleanup
generate systemd: remove leading slashes
2020-03-05 09:28:41 -05:00
Qi Wang d4540e07c7 Fix bug podman reset to not remove $XDG_RUNTIME_DIR
In some older systems we point the temporary directory to /run/user/1000 which leads podman system reset to clear unrelated files under XDG_RUNTIME_DIR. This patch only removes files created by podman if TmpDir is the  same as the XDG_RUNTIME_DIR.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-03-05 09:21:41 -05:00
TomSweeneyRedHat 6ad35e848d Fix upstream dockerfile and add 'by hand' ctrfile
The podmanimage/upstream/Dockerfile had two rpms in its
build procedure that are no longer available.  The atomic-registries
has been removed and the md2man has been renamed.  In addtion
conmon was not being installed and I've added that.

I've been using a Containerfile to build or rebuild a
specific version of the podmanimage stored in the stable
repository with a version tag.  As the other Containerfiles
have been updated by others, and in case anyone else needs
to build it, I've added it to the repo and have also updated
the readme.md.

FWIW, the builds in the quay.io/podman/upstream have been failing for a while due to missing rpms.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2020-03-05 09:15:58 -05:00
Valentin Rothberg a5c04c793e generate systemd: remove leading slashes
Remove leading slashes from the run-dir paths. It was meant to make it
explicit that we're dealing with an absolute path but user feedback has
shown that most are aware.  It also cleans up the path in the systemctl
status output.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-03-05 14:05:48 +01:00
OpenShift Merge Robot 9ffc525da7
Merge pull request #5382 from vrothberg/systemd-network
generate systemd: add network dependencies
2020-03-05 06:44:40 -05:00
OpenShift Merge Robot 0356c0ed91
Merge pull request #5397 from rhatdan/vendor
Vendor buildah 1.14.2
2020-03-05 05:39:25 -05:00
OpenShift Merge Robot 8a8c2fea69
Merge pull request #5396 from haircommander/fix_exec_error
exec: fix error code when conmon fails
2020-03-04 22:51:33 -05:00
OpenShift Merge Robot 834f397db2
Merge pull request #5389 from openSUSE/fix-image-sign-help
Fix podman image sign help output
2020-03-04 22:48:58 -05:00
Peter Hunt 4632b81c81 exec: fix error code when conmon fails
this is a cosmetic change that makes sure podman returns a sane error code when conmon dies underneath it

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-03-04 17:10:14 -05:00
Daniel J Walsh 0015c376a3
Vendor buildah 1.14.2
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-04 16:53:39 -05:00
Chris Evich 288ddaa5ca
Cirrus: Fix fedora-minimal mirroring
Builds of this dockerfile fail on quay.io due to not being able to pull
the base image.  Use a fully-qualified FROM name to work around this.

Signed-off-by: Chris Evich <cevich@redhat.com>
2020-03-04 14:24:58 -05:00
OpenShift Merge Robot 797da2a57b
Merge pull request #5381 from vrothberg/ENVFIX
env: set "container" to current binary
2020-03-04 13:26:48 -05:00
OpenShift Merge Robot 4d012cb6db
Merge pull request #5370 from TomSweeneyRedHat/dev/tsweeney/b1141
Bump to Buildah v1.14.1
2020-03-04 13:24:14 -05:00
OpenShift Merge Robot 8389552495
Merge pull request #5373 from haircommander/exec-pipe-ec
exec: get the exit code from sync pipe instead of file
2020-03-04 11:11:01 -05:00
OpenShift Merge Robot ce7ed2205a
Merge pull request #5385 from baude/makemap
avoid adding to nil map
2020-03-04 11:08:30 -05:00
Valentin Rothberg 6d2d6898f8 env: don't set "container" env
Leave setting the "container" variable to consumers of pkg/env.
Podman is now hard-setting it to "podman" while "libpod" will
set it internally to "libpod" if it's unset.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-03-04 17:07:47 +01:00
OpenShift Merge Robot 90eef95cb1
Merge pull request #4772 from boaz0/closes_4628
Add the rmi flag to podman-run to delete container image
2020-03-04 10:58:10 -05:00
OpenShift Merge Robot a8bc423e29
Merge pull request #5344 from edsantiago/log_format
CI: format cirrus logs
2020-03-04 10:55:36 -05:00
Sascha Grunert 6e1de159eb
Fix podman image sign help output
Adjust the help output to mention `podman image sign` instead of just
`podman sign`.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-03-04 09:22:53 +01:00
Brent Baude 822d5a486a avoid adding to nil map
we need to make the environment map to avoid throwing an error when trying to add an environment value from file.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-03-03 17:00:50 -06:00
Peter Hunt d3d97a25e8 Exec: use ErrorConmonRead
Before, we were using -1 as a bogus value in podman to signify something went wrong when reading from a conmon pipe. However, conmon uses negative values to indicate the runtime failed, and return the runtime's exit code.

instead, we should use a bogus value that is actually bogus. Define that value in the define package as MinInt32 (-1<< 31 - 1), which is outside of the range of possible pids (-1 << 31)

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-03-03 15:43:31 -05:00
Peter Hunt 4b72f9e401 exec: get the exit code from sync pipe instead of file
Before, we were getting the exit code from the file, in which we waited an arbitrary amount of time (5 seconds) for the file, and segfaulted if we didn't find it. instead, we should be a bit more certain conmon has sent the exit code. Luckily, it sends the exit code along the sync pipe fd, so we can read it from there

Adapt the ExecContainer interface to pass along a channel to get the pid and exit code from conmon, to be able to read both from the pipe

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-03-03 15:35:35 -05:00