summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #3497 from QazerLab/bugfix/systemd-generate-pidfileOpenShift Merge Robot2019-07-08
|\ | | | | Use conmon pidfile in generated systemd unit as PIDFile.
| * Do not hardcode podman binary location in generate systemd.Danila Kiver2019-07-07
| | | | | | | | | | | | | | | | It is not correct to rely on specific location of the podman binary. In most cases it is /usr/bin/podman, but sometimes is not (e.g. in system tests). Use /proc/self/exe instead of hardcoded path. Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
| * Move skipping systemd tests to early setup.Danila Kiver2019-07-06
| | | | | | | | | | | | | | There is no meaning of performing setup/teardown for these tests when we even can not work with systemd. Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
| * Reload systemd daemon on creation of units location dir in tests.Danila Kiver2019-07-06
| | | | | | | | | | | | | | | | Systemd manager drops non-existent directories from the units search path during initialization, thus, creation of UNIT_DIR, if it did not exist before, requres reloading the daemon. Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
| * Add debug information to "generate systemd" test.Danila Kiver2019-07-06
| | | | | | | | Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
| * Use default conmon pidfile location for root containers.Danila Kiver2019-07-04
| | | | | | | | | | | | | | | | | | | | The conmon pidfile is crucial for podman-generated systemd units, because these units rely on it for determining service's main process ID. With this change, every container has ConmonPidFile set (at least to default value). Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
| * Use conmon pidfile in generated systemd unit as PIDFile.Danila Kiver2019-07-04
| | | | | | | | | | | | | | | | | | | | | | By default, podman points PIDFile in generated unit file to non-existent location. As a result, the unit file, generated by podman, is broken: an attempt to start this unit without prior modification results in a crash, because systemd can not find the pidfile of service's main process. Fix the value of "PIDFile" and add a system test for this case. Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
* | Merge pull request #3515 from baude/rootlessintegrationtestsOpenShift Merge Robot2019-07-08
|\ \ | | | | | | speed up rootless tests
| * | speed up rootless testsbaude2019-07-08
| | | | | | | | | | | | | | | | | | | | | when running integrations tests as rootless, several tests still unnecessarily pull images which is costly in terms of time. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #3425 from adrianreber/restore-mount-labelOpenShift Merge Robot2019-07-08
|\ \ \ | | | | | | | | Set correct SELinux label on restored containers
| * | | Add exec after checkpoint/restore testAdrian Reber2019-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A container restored from a checkpoint archive used to have the root file-system mounted with a wrong (new) SELinux label. This made it, for example, impossible to use 'podman exec' on a restored container. This test tests exactly this. 'podman exec' after 'podman container restore'. Unfortunately this test does not fail, even without the patch that fixes it as the test seems to run in an environment where the SELinux label of the container root file-system is not relevant. Somehow. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | Provide correct SELinux mount-label for restored containerAdrian Reber2019-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restoring a container from a checkpoint archive creates a complete new root file-system. This file-system needs to have the correct SELinux label or most things in that restored container will fail. Running processes are not as problematic as newly exec()'d process (internally or via 'podman exec'). This patch tells the storage setup which label should be used to mount the container's root file-system. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | Track if a container is restored from an exported checkpointAdrian Reber2019-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of only tracking that a container is restored from a checkpoint locally in runtime_ctr.go this adds a flag to the Container structure. Upcoming patches to correctly label the root file-system mount-point need also to know if a container is restored from a checkpoint. Instead of passing a parameter around a lot of functions, this adds that information to the Container structure. Signed-off-by: Adrian Reber <areber@redhat.com>
* | | | Merge pull request #3517 from stefanb2/topic-doc-fix-healthcheck-commandOpenShift Merge Robot2019-07-08
|\ \ \ \ | |_|/ / |/| | | docs: fix --healthcheck-command option
| * | | docs: fix --healthcheck-command optionStefan Becker2019-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the documentation agree with the code. Related #3507 Signed-off-by: Stefan Becker <chemobejk@gmail.com>
* | | | Merge pull request #3377 from TomSweeneyRedHat/dev/tsweeney/gateOpenShift Merge Robot2019-07-08
|\ \ \ \ | | | | | | | | | | Add RUN priv'd test for build
| * | | | Add RUN priv'd test for buildTomSweeneyRedHat2019-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman 1.4.1 had problems with builds with a RUN command that tried to to a privliged command. This adds a gating test for that situation. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #3496 from baude/golandcodeinspectOpenShift Merge Robot2019-07-08
|\ \ \ \ \ | |_|/ / / |/| | | | code cleanup
| * | | | code cleanupbaude2019-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clean up code identified as problematic by golands inspection Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #3514 from baude/cornflakesOpenShift Merge Robot2019-07-08
|\ \ \ \ \ | | | | | | | | | | | | fix integration flake tests
| * | | | | fix integration flake testsbaude2019-07-08
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | attempts to correct three of our flakey integration tests Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #3512 from vrothberg/fix-contributingOpenShift Merge Robot2019-07-08
|\ \ \ \ \ | | | | | | | | | | | | CONTRIBUTING.md: fix project paths
| * | | | | CONTRIBUTING.md: fix project pathsValentin Rothberg2019-07-08
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The paths to the local libpod tree where missing the `./src` part which ultimately lead to compilation errors. Also place the git trees into containers/libpod and not into the user's GitHub root. Reported in #podman on IRC. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #3505 from baude/getlasteventOpenShift Merge Robot2019-07-08
|\ \ \ \ \ | |/ / / / |/| | | | get last container event
| * | | | get last container eventbaude2019-07-07
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | an internal change in libpod will soon required the ability to lookup the last container event using the continer name or id and the type of event. this pr is in preperation for that need. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #3472 from haircommander/generate-volumesOpenShift Merge Robot2019-07-04
|\ \ \ \ | | | | | | | | | | generate kube with volumes
| * | | | Improve parsing of mountsPeter Hunt2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, we were needlessly doing a double lookup to find which config mounts were user volumes. Improve this by refactoring a bit of code from inspect Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | | Add test for generate kube with volumesPeter Hunt2019-07-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | | Deduplicate volumesPeter Hunt2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for containers that share volumes, so the pod section doesn't list copies Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | | Pass along volumes to pod yamlPeter Hunt2019-07-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | | Configure container volumes for generate kubePeter Hunt2019-07-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #3495 from baude/golandcodecleanupOpenShift Merge Robot2019-07-04
|\ \ \ \ \ | | | | | | | | | | | | trivial cleanups from golang
| * | | | | trivial cleanups from golangbaude2019-07-03
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | the results of a code cleanup performed by the goland IDE. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #3493 from baude/psnostoreOpenShift Merge Robot2019-07-04
|\ \ \ \ \ | |/ / / / |/| | | | ps should use nostore when possible
| * | | | ps should use nostore when possiblebaude2019-07-03
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when not using --size with ps, we do not need a store. this should make ps more effecient when the system is under heavy load. also, prune unused ps functions as no longer needed. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #3488 from marcov/ctr-or-pod-idOpenShift Merge Robot2019-07-03
|\ \ \ \ | | | | | | | | | | libpod: discerne partial IDs between containers and pods
| * | | | libpod: discerne partial IDs between containers and podsMarco Vedovati2019-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When specifying a podman command with a partial ID, container and pod commands matches respectively only containers or pods IDs in the BoltDB. Fixes: #3487 Signed-off-by: Marco Vedovati <mvedovati@suse.com>
* | | | | Merge pull request #3242 from ↵OpenShift Merge Robot2019-07-03
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | adel-mamin/adel-mamin/install-md-update-for-manjaro Updated install.md for Manjaro Linux
| * | | | | Added instruction to enable the user namespaces permanenty in ManjaroAdel Mamin2019-07-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adel Mamin <adel.mamin@exafore.com>
| * | | | | Addressed code review commentsAdel Mamin2019-07-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adel Mamin <adel.mamin@exafore.com>
| * | | | | Updated install.md for Manjaro LinuxAdel Mamin2019-07-03
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Adel Mamin <adel.mamin@exafore.com>
* | | | | Merge pull request #3486 from openSUSE/ocicni-bumpOpenShift Merge Robot2019-07-03
|\ \ \ \ \ | | | | | | | | | | | | Vendor latest OCICNI version
| * | | | | Vendor latest OCICNI versionSascha Grunert2019-07-03
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for dual stack IPv6 support within CRI-O. Because the API changed within OCICNI, we have to adapt the internal linux networking as well. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | | Merge pull request #3437 from giuseppe/fix-nocgoOpenShift Merge Robot2019-07-03
|\ \ \ \ \ | | | | | | | | | | | | build: allow to build without cgo on RISC-V
| * | | | | cirrus: add test for compiling without cgoGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | lock: new lock type "file"Giuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is a wrapper around containers/storage file locking. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | runtime: allow to specify the lock mechanismGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preparation for the next patch. It currently supports only "shm". Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | lock: disable without cgoGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | spec: move cgo stuff to their own fileGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so it can build without cgo since seccomp requires it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | rootless: allow to build without cgoGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unfortunately rootless won't work without cgo, as most of the implementation is in C, but at least allow to build libpod. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>