summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #6177 from baude/v2enableremoteOpenShift Merge Robot2020-05-20
|\ | | | | v2 enable remote integration tests
| * v2 enable remote integration testsBrent Baude2020-05-19
| | | | | | | | | | | | enable remote integration tests Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #6266 from mheon/bump-2.0.0-rc1OpenShift Merge Robot2020-05-18
|\ \ | |/ |/| Bump to v2.0.0-RC1
| * Bump to v2.0.0-devMatthew Heon2020-05-18
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Bump to v2.0.0-rc1v2.0.0-rc1Matthew Heon2020-05-18
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #6249 from jwhonce/wip/resizeOpenShift Merge Robot2020-05-18
|\ \ | | | | | | V2 Implement terminal handling in bindings attach
| * | V2 Implement terminal handling in bindings attachJhon Honce2020-05-18
| |/ | | | | | | | | | | | | | | | | * Add support for /exec/{id}/resize * Add support for ErrSessionNotFound * Resize container TTY as stdin changes size * Refactor all resize functions into one handler Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #6188 from neVERberleRfellerER/autoupdate-systemd-envvarOpenShift Merge Robot2020-05-18
|\ \ | | | | | | Give `auto-update` ability to use per-container authfile specified by label.
| * | Give `auto-update` ability to use per-container authfile specified by label.Ondřej Kraus2020-05-17
| | | | | | | | | | | | Signed-off-by: Ondřej Kraus <neverberlerfellerer@gmail.com>
* | | Merge pull request #6268 from baude/varlinkbuild2OpenShift Merge Robot2020-05-18
|\ \ \ | | | | | | | | Fix EOM for SendFile
| * | | Fix EOM for SendFileBrent Baude2020-05-18
| | |/ | |/| | | | | | | | | | | | | | | | | | | To terminate a connection of varlink, say after sending a file, we need to send a message containing a delimiter of ':' so the client knows to hang up. Fixes: #6237 Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #6232 from edsantiago/bats_cgroupsv1_fixesOpenShift Merge Robot2020-05-18
|\ \ \ | |/ / |/| | system tests: small fixes for rawhide+cgroups v1
| * | system tests: small fixes for rawhide+cgroups v1Ed Santiago2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three small fixes for breaking tests on rawhide: 1) run test: looks like runc changed the format of an error message, adding a colon in one place. runc is used on rawhide when booted in cgroups v1 2) volumes test: difference in exit status and error message between runc and crun. 3) systemd test: define XDG_RUNTIME_DIR if unset. podman helpfully sets this to a reasonable default, but the 'systemctl' commands used in this test do not. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #6264 from baude/v2rmiOpenShift Merge Robot2020-05-18
|\ \ \ | | | | | | | | v2endpoint remove image path correction
| * | | v2endpoint remove image path correctionBrent Baude2020-05-18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the endpoint for single image removal (on the libpod side) should be as follows: versionedPath/libpod/images/IMAGENAME The DELETE method then signifies the removal of the image. Fixes: #6261 Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #6231 from mheon/fix_coverityOpenShift Merge Robot2020-05-17
|\ \ \ | |_|/ |/| | Fix two coverity issues (unchecked null return)
| * | Fix two coverity issues (unchecked null return)Matthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Theoretically these should never happen, but it never hurts to be sure and check. Add a check to one, make the other one a create-if-not-exist (it was just adding, not checking the contents). Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #5831 from mheon/exec_http_attachOpenShift Merge Robot2020-05-15
|\ \ \ | | | | | | | | APIv2 ExecStart (Attached Only)
| * | | Drop APIv2 resize endpointMatthew Heon2020-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Jhon is working on an alternative version that will combine container and exec session resize, so we'll wait for that. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Drop a debug line which could print very large messagesMatthew Heon2020-05-15
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Fix lintMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Remove duplicated exec handling codeMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the initial workup of HTTP exec, I duplicated most of the existing exec handling code so I could work on it without breaking normal exec (and compare what I was doing to the nroaml version). Now that it's done and working, we can switch over to the refactored version and ditch the original, removing a lot of duplicated code. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Fix lintMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Update API documentation for InspectMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most importantly, note the pruning behavior of compat Inspect. Less importantly, note that the Tty parameter to Start is only ignored, as opposed to being not supported. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Parameters for ExecStart are body, not queryMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops. Misread the docs when I initially implemented this. Nice and easy fix, at least. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Prune stale exec sessions on inspectMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The usual flow for exec is going to be: - Create exec session - Start and attach to exec session - Exec session exits, attach session terminates - Client does an exec inspect to pick up exit code The safest point to remove the exec session, without doing any database changes to track stale sessions, is to remove during the last part of this - the single inspect after the exec session exits. This is definitely different from Docker (which would retain the exec session for up to 10 minutes after it exits, where we will immediately discard) but should be close enough to be not noticeable in regular usage. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Remove exec sessions on container restartMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With APIv2, we cannot guarantee that exec sessions will be removed cleanly on exit (Docker does not include an API for removing exec sessions, instead using a timer-based reaper which we cannot easily replicate). This is part 1 of a 2-part approach to providing a solution to this. This ensures that exec sessions will be reaped, at the very least, on container restart, which takes care of any that were not properly removed during the run of a container. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Fix start order for APIv2 exec start endpointMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | This makes the endpoint (mostly) functional. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Don't fail when saving exec status fails on removed ctrMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't save the exec session, but it's because the container is entirely gone, so no point erroring. Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Add APIv2 handler for resizing exec sessionsMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Ensure that Streams are set to defaults for HTTP attachMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If not overridden, we should use the attach configuration given when the exec session was first created. Also, setting streams should not conflict with a TTY - the two are allowed together with Attach and should be allowed together here. Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Wire in endpoint for ExecStartMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is still very early not not well tested, and missing resize capability, but it does provide the first bits of exec. Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Add an initial implementation of HTTP-forwarded execMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is heavily based off the existing exec implementation, but does not presently share code with it, to try and ensure we don't break anything. Still to do: - Add code sharing with existing exec implementation - Wire in the frontend (exec HTTP endpoint) - Move all exec-related code in oci_conmon_linux.go into a new file - Investigate code sharing between HTTP attach and HTTP exec. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #6230 from rhatdan/makefileOpenShift Merge Robot2020-05-15
|\ \ \ \ | | | | | | | | | | Fix REMOTETAGS
| * | | | Fix REMOTETAGSDaniel J Walsh2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle REMOTETAGS the same way for all remote commands. This fixes issues where remote commands are not building correctly on rhel7 and centos7 systems. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #6246 from baude/v2remoterunOpenShift Merge Robot2020-05-15
|\ \ \ \ \ | | | | | | | | | | | | v2 podman remote attach, start, and run
| * | | | | v2 podman remote attach, start, and runBrent Baude2020-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the remote client, add the ability to attach to a container, start a container, and run a container. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | | | Merge pull request #6201 from cevich/update_ubuntu20OpenShift Merge Robot2020-05-15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Cirrus: Update Ubuntu 18 to 20
| * | | | | Cirrus: Refresh VM Images, Add Ubuntu 20 LTSChris Evich2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Fix image-name hintsChris Evich2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This properly prints out image-name hints when executing the hack script without any arguments. It is required due to changes made by Ed for test-name beatification. An identical change was made and reviewed by Ed in the containers/storage repo. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Update Ubuntu 18 to 20Chris Evich2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | Merge pull request #6215 from maxm123/masterOpenShift Merge Robot2020-05-15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use the containers.conf cni_config_dir option for inspect and delete
| * | | | | | Use the libpod.conf cni_config_dir option for inspect and deleteMaximilian Müller2020-05-14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pkg/network/files.go methods currently use the constant '/etc/cni/net.d' for network handling. This results in the unability of podman-network-inspect and podman-network-rm to locate the cni network configuration files. This commit propagates the libpod.Runtime through the networking methods and finally makes use of its configuration (config.Network.NetworkConfigDir). Closes #6212 Signed-off-by: Maximilian Müller <maxm123@techie.com>
* | | | | | Merge pull request #6227 from adrianreber/typoOpenShift Merge Robot2020-05-15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix checkpoint --leave-running
| * | | | | | Fix checkpoint --leave-runningAdrian Reber2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was typo in the variable name and in one place it was not correctly passed to the next layer. Signed-off-by: Adrian Reber <areber@redhat.com>
* | | | | | | Merge pull request #6236 from jwhonce/wip/boxedOpenShift Merge Robot2020-05-14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Make convenience boxed true/false easier to use
| * | | | | | Make convenience boxed true/false easier to useJhon Honce2020-05-14
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changed PFalse to &false * changed PTrue to &true Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | Merge pull request #6229 from mheon/small_kata_fixOpenShift Merge Robot2020-05-14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cleanup OCI runtime before storage
| * | | | | | Ensure that cleanup runs before we set Removing stateMatthew Heon2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up the OCI runtime is not allowed in the Removing state. To ensure it is actually cleaned up, when calling cleanup() as part of removing a container, do so before we set the Removing state, so we can successfully remove. Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | | | Cleanup OCI runtime before storageMatthew Heon2020-05-14
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some runtimes (e.g. Kata containers) seem to object to having us unmount storage before the container is removed from the runtime. This is an easy fix (change the order of operations in cleanup) and seems to make more sense than the way we were doing things. Signed-off-by: Matthew Heon <mheon@redhat.com>