summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #2358 from rhatdan/namespaceOpenShift Merge Robot2019-02-25
|\ | | | | Fix up handling of user defined network namespaces
| * Fix up handling of user defined network namespacesDaniel J Walsh2019-02-23
| | | | | | | | | | | | | | | | | | If user specifies network namespace and the /etc/netns/XXX/resolv.conf exists, we should use this rather then /etc/resolv.conf Also fail cleaner if the user specifies an invalid Network Namespace. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #2432 from giuseppe/fix-read-only-bind-mountsOpenShift Merge Robot2019-02-25
|\ \ | | | | | | podman: fix ro bind mounts if no* opts are on the source
| * | podman: fix ro bind mounts if no* opts are on the sourceGiuseppe Scrivano2019-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for the runc issue: https://github.com/opencontainers/runc/issues/1247 If the source of a bind mount has any of nosuid, noexec or nodev, be sure to propagate them to the bind mount so that when runc tries to remount using MS_RDONLY, these options are also used. Closes: https://github.com/containers/libpod/issues/2312 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2424 from vrothberg/update-buildah-descriptionOpenShift Merge Robot2019-02-25
|\ \ \ | | | | | | | | [skip-ci] README.md: rephrase Buildah description
| * | | README.md: rephrase Buildah descriptionValentin Rothberg2019-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rephrase the description of Buildah to make some core attributes (e.g., rootless, Dockerfile-less build, etc.) more obvious. Addresses: [#1349 (comment)](https://github.com/containers/buildah/issues/1349#issuecomment-466096550) Cherry-pick-from: https://github.com/containers/buildah/pull/1362 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #2421 from rhatdan/rmiOpenShift Merge Robot2019-02-25
|\ \ \ \ | |/ / / |/| | | Change exit code to 1 on podman rmi nosuch image
| * | | Change exit code to 1 on podman rmi nosuch imageDaniel J Walsh2019-02-25
|/ / / | | | | | | | | | | | | | | | | | | | | | Make it easy for scripts to determine if an image removal failure. If only errors were no such image exit with 1 versus 125. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #2423 from rhatdan/rmOpenShift Merge Robot2019-02-25
|\ \ \ | | | | | | | | Change exit code to 1 on podman rm nosuch container
| * | | Change exit code to 1 on podman rm nosuch containerDaniel J Walsh2019-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it easy for scripts to determine if a container removal fails versus the container did not exist. If only errors were no such container exit with 1 versus 125. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #2417 from rhatdan/resolv.confOpenShift Merge Robot2019-02-25
|\ \ \ \ | | | | | | | | | | In shared networkNS /etc/resolv.conf&/etc/hosts should be shared
| * | | | In shared networkNS /etc/resolv.conf&/etc/hosts should be sharedDaniel J Walsh2019-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should just bind mount the original containers /etc/resolv.conf and /etchosts into the new container. Changes in the resolv.conf and hosts should be seen by all containers, This matches Docker behaviour. In order to make this work the labels on these files need to have a shared SELinux label. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #2429 from baude/maindupsOpenShift Merge Robot2019-02-25
|\ \ \ \ \ | |_|/ / / |/| | | | remove duplicate commands in main
| * | | | remove duplicate commands in mainbaude2019-02-25
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kube was erronously being added as main subcommand multiple times. it should not be a subcommand as it should live under either play or generate. also removing the addition of the volume command from the commands.go to eliminate a duplicate. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2425 from vrothberg/update-issue-templateOpenShift Merge Robot2019-02-25
|\ \ \ \ | |_|/ / |/| | | issue template: run `podman info --debug`
| * | | issue template: run `podman info --debug`Valentin Rothberg2019-02-25
|/ / / | | | | | | | | | | | | | | | | | | Ask users to run podman-info with `--debug` to the exact git commit, compiler and go version. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #2419 from rhatdan/playOpenShift Merge Robot2019-02-24
|\ \ \ | | | | | | | | Fix play to show up in podman help
| * | | Fix play to show up in podman helpDaniel J Walsh2019-02-23
| |/ / | | | | | | | | | | | | | | | Also change generate cli calls to match other commands. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #2416 from rhatdan/networkOpenShift Merge Robot2019-02-24
|\ \ \ | | | | | | | | Allow dns settings with --net=host
| * | | Allow dns settings with --net=hostDaniel J Walsh2019-02-23
| |/ / | | | | | | | | | | | | | | | | | | | | | This seems to be a needless restriction. We make a copy of the hosts /etc/resolv.conf file, so these changes to not modify the host. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #2413 from baude/remotepodstopOpenShift Merge Robot2019-02-24
|\ \ \ | | | | | | | | Enable more podman-remote pod commands
| * | | Enable more podman-remote pod commandsbaude2019-02-22
| | | | | | | | | | | | | | | | | | | | | | | | enable pod start, stop, and kill subcommands for the remote-client. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2400 from rhatdan/pullOpenShift Merge Robot2019-02-23
|\ \ \ \ | | | | | | | | | | Switch defaults for podman build versus buildah
| * | | | Switch defaults for podman build versus buildahDaniel J Walsh2019-02-23
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch defaults for --layers, --force-rm and --pull-always from buildah to podman. Only override default values. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #2404 from baude/remoteerrorsOpenShift Merge Robot2019-02-23
|\ \ \ \ | |/ / / |/| | | make remote-client error messaging more robust
| * | | make remote-client error messaging more robustbaude2019-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the remote-client is currently weak for carrying error messages over the varlink interface and displaying something useful to users and developers for the purposes of debug. this is a starting point to improve that user experience. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2393 from giuseppe/reexec-into-same-wdOpenShift Merge Robot2019-02-23
|\ \ \ \ | |_|_|/ |/| | | rootless: force same cwd when re-execing
| * | | tests, rootless: use relative path for export testGiuseppe Scrivano2019-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | rootless: force same cwd when re-execingGiuseppe Scrivano2019-02-22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | when joining an existing namespace, we were not maintaining the current working directory, causing commands like export -o to fail when they weren't referring to absolute paths. Closes: https://github.com/containers/libpod/issues/2381 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2401 from TomSweeneyRedHat/dev/tsweeney/buildah1.7OpenShift Merge Robot2019-02-22
|\ \ \ | |/ / |/| | Vendor Buildah v1.7
| * | Vendor Buildah v1.7TomSweeneyRedHat2019-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> Vendors in Buildah 1.7 into Podman. Also the latest imagebuilder and changes for `build --target` Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #2406 from rhatdan/errorsOpenShift Merge Robot2019-02-22
|\ \ \ | | | | | | | | Exit with errors not just logging error
| * | | Exit with errors not just logging errorDaniel J Walsh2019-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Several commands were logging errors but exiting with a 0 exit code. This patch cleans these up. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #2410 from giuseppe/cp-rootless-supportOpenShift Merge Robot2019-02-22
|\ \ \ \ | |_|/ / |/| | | cmd: support rootless mode for cp command
| * | | cmd: support rootless mode for cp commandGiuseppe Scrivano2019-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #2403 from giuseppe/fix-runtimeOpenShift Merge Robot2019-02-22
|\ \ \ \ | |_|/ / |/| | | podman: --runtime has higher priority on runtime_path
| * | | podman: --runtime has higher priority on runtime_pathGiuseppe Scrivano2019-02-22
| | |/ | |/| | | | | | | | | | | | | | | | if --runtime is specified, then it has higher priority on the runtime_path option, which was added for backward compatibility. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2386 from baude/cobravalidationOpenShift Merge Robot2019-02-22
|\ \ \ | |_|/ |/| | Improve command line validation
| * | hide --latest on the remote-clientbaude2019-02-22
| | | | | | | | | | | | | | | | | | | | | | | | in the case of the remote-client, it was decided to hide the latest flag to avoid confusion for end-users on what the "last" container, volume, or pod are. Signed-off-by: baude <bbaude@redhat.com>
| * | Improve command line validationbaude2019-02-22
| |/ | | | | | | | | | | | | Use the checkallandlatest function to validate flag usage as part of the cobra command args validation. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #2402 from baude/remotepodinspectOpenShift Merge Robot2019-02-22
|\ \ | |/ |/| podman-remote pod inspect|exists
| * podman-remote pod inspect|existsbaude2019-02-22
| | | | | | | | | | | | | | | | enable the remote client to be able to inspect a pod. also, bonus of enabling the podman pod exists command which returns a 0 or 1 depending on whether the given pod exists. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #2411 from cevich/ubuntu_go111Daniel J Walsh2019-02-22
|\ \ | | | | | | Cirrus: Install Go 1.11 on Ubuntu VMs
| * | Cirrus: Install Go 1.11 on Ubuntu VMsChris Evich2019-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no native package for this, so the packaged version must also be installed, otherwise all the support/dependencies would be removed also (like go-md2man). Fix this by installing from the google released tarball, into /usr/local/go and set $GOROOT to point there. Also, include a small fix for hack/get_ci_vm.sh not installing testing dependencies because of an old assumption. ***CIRRUS: REBUILD IMAGES*** Signed-off-by: Chris Evich <cevich@redhat.com>
| * | Cirrus: Add 20m extra timeout for UbuntuChris Evich2019-02-22
|/ / | | | | | | | | | | | | Tests running slower than normally-slow, bump timeout to allow them to pass until better solution (for slow Ubuntu tests) can be found. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #2389 from baude/issue2388OpenShift Merge Robot2019-02-22
|\ \ | | | | | | add newline to images output
| * \ Merge pull request #4 from edsantiago/pr2389_updateBrent Baude2019-02-21
| |\ \ | | | | | | | | update: remove duplicate newline
| | * | update: remove duplicate newlineEd Santiago2019-02-21
| |/ / | | | | | | | | | Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | add newline to images outputbaude2019-02-20
| | | | | | | | | | | | | | | | | | | | | | | | ensure a final newline is always added to images output. fixes #2388 Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2350 from mheon/lock_renumberOpenShift Merge Robot2019-02-21
|\ \ \ | |_|/ |/| | Add lock renumbering