4934 Commits

Author SHA1 Message Date
eae9a009b2 Merge pull request #3624 from haircommander/conmon-exec-with-remote-exec
Add remote exec
2019-07-24 13:16:21 +02:00
0d441f57d6 Merge pull request #3633 from QiWang19/network
fix build --network=container
2019-07-24 12:47:29 +02:00
0e85b82741 Merge pull request #3638 from hooksie1/issue-#3577
Fixes issue #3577.
2019-07-24 12:36:26 +02:00
777cce20ca Fixes issue #3577.
Fix punctuation and wording in some places.

Signed-off-by: John Hooks <hooksie11@gmail.com>
2019-07-23 22:52:24 -04:00
3c6b111789 Merge pull request #3634 from mheon/fix_32bit
Re-add int64 casts for ctime to fix 32-bit build
2019-07-24 03:59:23 +02:00
01a8483a59 refactor to reduce duplicated error parsing
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 16:49:04 -04:00
82dce36fb6 remove debug prints
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 16:49:04 -04:00
7a85317ccb Re-add int64 casts for ctime
The variables here are 64-bit on 64-bit builds, so the linter
recommends stripping them. Unfortunately, they're 32-bit on
32-bit builds, so stripping them breaks that. Readd with a nolint
to convince it to not break.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-07-23 15:43:40 -04:00
8c9b78e8bc fix build --network=container
Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-07-23 15:11:42 -04:00
7dbc6d8f36 Merge pull request #3619 from cevich/workaround_missing_iamge
Cirrus: Temp. workaround missing imgprune image
2019-07-23 19:40:52 +02:00
5fb4feb36a Fix a segfault on Podman no-store commands with refresh
When a command (like `ps`) requests no store be created, but also
requires a refresh be performed, we have to ignore its request
and initialize the store anyways to prevent segfaults. This work
was done in #3532, but that missed one thing - initializing a
storage service. Without the storage service, Podman will still
segfault. Fix that oversight here.

Fixes #3625

Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-07-23 13:30:30 -04:00
d59f083637 always send generic error in case io fails
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 13:30:15 -04:00
9e69285704 only use stdin if specified
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 13:30:15 -04:00
74ab273e91 buffer errChan
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 13:30:15 -04:00
a4041dafae move handleTerminalAttach to generic build
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 13:30:14 -04:00
638b73a046 remove unnecessary conversions
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 13:29:33 -04:00
5bf99a82ff add detach keys support for remote
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 13:29:33 -04:00
479eeac62c move editing of exitCode to runtime
There's no way to get the error if we successfully get an exit code (as it's just printed to stderr instead).
instead of relying on the error to be passed to podman, and edit based on the error code, process it on the varlink side instead

Also move error codes to define package

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 13:29:33 -04:00
35ba77e040 Update e2e tests for remote exec
including changing -l to the container id
and separating a case of setting the env that remote can't handle

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 13:29:33 -04:00
2a474c88c9 Finish up remote exec implementation
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-23 13:29:33 -04:00
bb253af3fd Merge pull request #3630 from baude/golangcilint5
golangci-lint cleanup
2019-07-23 19:26:20 +02:00
a793bccae6 golangci-lint cleanup
a PR slipped through without running the new linter.  this cleans things
up for the master branch.

Signed-off-by: baude <bbaude@redhat.com>
2019-07-23 10:13:04 -05:00
ce60c4d30c Merge pull request #3623 from TomSweeneyRedHat/dev/tsweeney/pimagereadme
Change wait to sleep in podmanimage readme
2019-07-23 12:14:40 +02:00
26749204d5 Merge pull request #3621 from baude/golangcilint4
golangci-lint phase 4
2019-07-23 10:21:41 +02:00
1c0603e9b8 install.md: mention all build tags
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-07-23 09:35:22 +02:00
a12a2312ac Merge pull request #3143 from haircommander/conmon-exec
use conmon for exec
2019-07-22 22:46:18 +02:00
0c3038d4b5 golangci-lint phase 4
clean up some final linter issues and add a make target for
golangci-lint. in addition, begin running the tests are part of the
gating tasks in cirrus ci.

we cannot fully shift over to the new linter until we fix the image on
the openshift side.  for short term, we will use both

Signed-off-by: baude <bbaude@redhat.com>
2019-07-22 15:44:04 -05:00
6dc0f1bec3 Change wait to sleep in podmanimage readme
Change wait to sleep 100000 as we've had some reports of problems
with wait:  https://github.com/containers/buildah/issues/1665

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2019-07-22 16:23:39 -04:00
53e1ede46b bump cirrus images to get new conmon
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-22 15:57:23 -04:00
a1a79c08b7 Implement conmon exec
This includes:
	Implement exec -i and fix some typos in description of -i docs
	pass failed runtime status to caller
	Add resize handling for a terminal connection
	Customize exec systemd-cgroup slice
	fix healthcheck
	fix top
	add --detach-keys
	Implement podman-remote exec (jhonce)
	* Cleanup some orphaned code (jhonce)
	adapt remote exec for conmon exec (pehunt)
	Fix healthcheck and exec to match docs
		Introduce two new OCIRuntime errors to more comprehensively describe situations in which the runtime can error
		Use these different errors in branching for exit code in healthcheck and exec
	Set conmon to use new api version

Signed-off-by: Jhon Honce <jhonce@redhat.com>

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-22 15:57:23 -04:00
cf9efa90e5 Merge pull request #3620 from haircommander/bump-conmon
use conmon v1.0.0-rc2
2019-07-22 21:43:59 +02:00
69f74f13b0 Merge pull request #3598 from vrothberg/update-image
vendor github.com/containers/image@v2.0.1
2019-07-22 19:39:55 +02:00
0671dca90d bump conmon to 1.0.0-rc2
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-07-22 13:20:51 -04:00
9b2e98f1e8 Cirrus: Temp. workaround missing imgprune image
The 'image_prune' task only runs on master, post-merge and
is currently failing for all builds.  This is because it
references a non-existent image.  The person with access
to add/enable this image is on PTO.  Fix this by temporarily
using a hand-built image until an automatic build can be added.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-07-22 10:49:31 -04:00
c1b792c1e0 vendor github.com/containers/image@v2.0.1
* progress bar: use spinners for unknown blob sizes
* use 'containers_image_ostree' as build tag
* ostree: default is no OStree support
* Add "Env" to ImageInspectInfo
* config.go: improve debug message
* config.go: log where credentials come from
* Fix typo in docs/containers-registries.conf.5.md
* docker: delete: support all MIME types
* Try harder in storageImageDestination.TryReusingBlob
* docker: allow deleting OCI images
* ostree: improve error message

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-07-22 14:35:03 +02:00
ab7b47ca60 Merge pull request #3605 from nc-ruth/patch-1
"mkdir -p /etc/cni/net.d" requires sudo
2019-07-22 13:30:50 +02:00
3b52e4d0b5 Merge pull request #3562 from baude/golangcilint3
golangci-lint round #3
2019-07-22 13:13:50 +02:00
db826d5d75 golangci-lint round #3
this is the third round of preparing to use the golangci-lint on our
code base.

Signed-off-by: baude <bbaude@redhat.com>
2019-07-21 14:22:39 -05:00
d6b41eb393 Merge pull request #3611 from rhatdan/dan
Remove debug message
2019-07-21 09:56:07 +02:00
f7f66f6a88 Remove debug message
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-07-20 16:20:48 -04:00
a5aa44c583 Merge pull request #3610 from rhatdan/pullmsg
Cleanup Pull Message
2019-07-20 17:05:05 +02:00
8364552e10 Merge pull request #3601 from cevich/fix_post_merge_build_each_commit
Cirrus: Fix post-merge env. var. not set.
2019-07-20 12:18:08 +02:00
20302cb65d Cleanup Pull Message
Currently the pull message on failure is UGLY.  This patch removes a lot of the noice
when pulling an image from multiple registries to make the user experience better.

Our current messages are way too verbose and need to be dampened down.  Still has
verbose mode if you turn on log-level=debug.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-07-20 06:08:22 -04:00
4c6e8aa6e2 Cirrus: Fix post-merge env. var. not set.
Cirrus-CI automatically sets `$CIRRUS_BASE_BRANCH` during PR testing.
This is used for the `build_each_commit` task, in order to compute the
commit-chain properly.  However, prior to this commit and after a PR
merges, the post-merge `build_each_commit` task would fail with
something similar to:

```
make build-all-new-commits GIT_BASE_BRANCH=origin/$CIRRUS_BASE_BRANCH |& ${TIMESTAMP}
[12:28:59] START - All [+xxxx] lines that follow are relative to right now.
[+0000s] # Validate that all the commits build on top of origin/
[+0000s] git rebase origin/ -x make
[+0000s] fatal: invalid upstream 'origin/'
[+0000s] make: *** [Makefile:426: build-all-new-commits] Error 128
[12:28:59] END - [+0000s] total duration since START
Exit status: 2
```

This is because `$CIRRUS_BASE_BRANCH` is undefined when CI runs against
a branch (by design).  This commit fixes the problem by referring to
`$DEST_BRANCH` instead.  This variable must always point at the intended
destination branch for testing, and so can be used in this context as
well.

Also updated a few comments to help steer understanding of the
`$DEST_BRANCH` purpose.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-07-19 14:30:35 -04:00
02140ea7d1 Merge pull request #3590 from rhatdan/ro
Add support for listing read/only and read/write images
2019-07-19 14:59:13 +02:00
45b6e98c88 mkdir -p /etc/cni/net.d requires sudo
Signed-off-by: Rubatharisan Thirumathyam <ruth@netcompany.com>
2019-07-19 14:58:37 +02:00
8ae97b2f57 Add support for listing read/only and read/write images
When removing --all images prune images only attempt to remove read/write images,
ignore read/only images

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-07-19 06:59:49 -04:00
398aeac853 Merge pull request #3599 from QiWang19/ps-regexp
support podman ps filter regular expressions
2019-07-19 03:27:28 +02:00
deb087d7b1 Merge pull request #3443 from adrianreber/rootfs-changes-migration
Include changes to the container's root file-system in the checkpoint archive
2019-07-19 02:38:26 +02:00
b59abdc1b1 Merge pull request #3579 from QiWang19/dns_net
fix --dns and --network conflict
2019-07-19 02:22:28 +02:00