summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* typoMatthew Cengia2021-02-03
| | | | Signed-off-by: Matthew Cengia <mattcen@mattcen.com>
* Merge pull request #9084 from rhatdan/overrideOpenShift Merge Robot2021-01-26
|\ | | | | Fix --arch and --os flags to work correctly
| * Fix --arch and --os flags to work correctlyDaniel J Walsh2021-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently podman implements --override-arch and --overide-os But Podman has made these aliases for --arch and --os. No reason to have to specify --override, since it is clear what the user intends. Currently if the user specifies an --override-arch field but the image was previously pulled for a different Arch, podman run uses the different arch. This PR also fixes this issue. Fixes: https://github.com/containers/podman/issues/8001 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #9094 from rhatdan/mountOpenShift Merge Robot2021-01-26
|\ \ | | | | | | Pass DefaultMountsFile to podman build
| * | Pass DefaultMountsFile to podman buildDaniel J Walsh2021-01-25
|/ / | | | | | | | | | | | | The --default-mounts-file path was not being handled in podman build. This will enable it to use for testing. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #9090 from mheon/sync_shutdownOpenShift Merge Robot2021-01-25
|\ \ | | | | | | [NO TESTS NEEDED] Ensure shutdown handler access is syncronized
| * | Ensure shutdown handler access is syncronizedMatthew Heon2021-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a potential race where two handlers could be added at the same time. Go Maps are not thread-safe, so that could do unpleasant things. Add a mutex to keep things safe. Also, swap the order or Register and Start for the handlers in Libpod runtime created. As written, there was a small gap between Start and Register where SIGTERM/SIGINT would be completely ignored, instead of stopping Podman. Swapping the two closes this gap. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #9091 from edsantiago/more_batsOpenShift Merge Robot2021-01-25
|\ \ \ | | | | | | | | System tests: cover gaps from the last month
| * | | System tests: cover gaps from the last monthEd Santiago2021-01-25
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - stop: test --all and --ignore (#9051) - build: test /run/secrets (#8679, but see below) - sensitive mount points: deal with 'stat' failures - selinux: confirm useful diagnostics on unknown labels (#8946) The 'build' test is intended as a fix for #8679, in which 'podman build' does not mount secrets from mounts.conf. Unfortunately, as of this writing, 'podman build' does not pass the --default-mounts-file option to buildah, so there's no reasonable way to test this path. Still, we can at least confirm /run/secrets on 'podman run'. The /sys thing is related to #8949: RHEL8, rootless, cgroups v1. It's just a workaround to get gating tests to pass on RHEL. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #9081 from ↵OpenShift Merge Robot2021-01-25
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/github.com/google/uuid-1.2.0 Bump github.com/google/uuid from 1.1.5 to 1.2.0
| * | Bump github.com/google/uuid from 1.1.5 to 1.2.0dependabot-preview[bot]2021-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/google/uuid](https://github.com/google/uuid) from 1.1.5 to 1.2.0. - [Release notes](https://github.com/google/uuid/releases) - [Commits](https://github.com/google/uuid/compare/v1.1.5...v1.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9085 from rhatdan/docsOpenShift Merge Robot2021-01-25
|\ \ \ | |_|/ |/| | Fix typo
| * | Fix typoTeeVenDick2021-01-25
| | | | | | | | | | | | | | | | | | Copied from @TeeVenDick patch https://github.com/containers/podman/pull/9072 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9079 from Luap99/fish-completionOpenShift Merge Robot2021-01-25
|\ \ \ | | | | | | | | [CI:DOCS] Fix fish completion issue if the command is prefixed with a space
| * | | Fix fish completion issue if the command is prefixed with a spacePaul Holzinger2021-01-24
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Update the completion script like https://github.com/spf13/cobra/pull/1249. [NO TESTS NEEDED] Fixes #8829 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #9057 from baude/dnsnameinternalOpenShift Merge Robot2021-01-25
|\ \ \ | |_|/ |/| | disable dnsname when --internal
| * | disable dnsname when --internalbaude2021-01-25
| | | | | | | | | | | | | | | | | | | | | | | | when doing a network creation, the dnsname plugin should be disabled when the --internal bool is set. a warning is displayed if this happens and docs are updated. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #9080 from siretart/patch-1OpenShift Merge Robot2021-01-25
|\ \ \ | |_|/ |/| | swagger.go: Fix compilation error
| * | swagger.go: Fix compilation errorReinhard Tartler2021-01-24
|/ / | | | | | | | | | | | | | | | | | | | | Error looks like: # github.com/containers/podman/pkg/api/handlers/swagger src/github.com/containers/podman/pkg/api/handlers/swagger/swagger.go:169:3: undefined: libpod.InspectVolumeData [NO TESTS NEEDED] Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | Merge pull request #9066 from giuseppe/set-source-to-netOpenShift Merge Robot2021-01-24
|\ \ | | | | | | networking: lookup child IP in networks
| * | networking: lookup child IP in networksGiuseppe Scrivano2021-01-23
| |/ | | | | | | | | | | | | | | | | | | | | | | if a CNI network is added to the container, use the IP address in that network instead of hard-coding the slirp4netns default. commit 5e65f0ba30f3fca73f8c207825632afef08378c1 introduced this regression. Closes: https://github.com/containers/podman/issues/9065 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #9071 from TomSweeneyRedHat/dev/tsweeney/bump_crypto2OpenShift Merge Robot2021-01-24
|\ \ | | | | | | Bump golang.org/x/crypto
| * | Bump golang.org/x/cryptoroot2021-01-23
|/ / | | | | | | | | | | | | Bump golang.org.x/cyrpto to the latest Signed-off-by: root <root@localhost.localdomain> Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | Merge pull request #9073 from mlegenovic/masterOpenShift Merge Robot2021-01-23
|\ \ | |/ |/| Small API test improvement for compatibility search endpoint
| * Small API test improvement for compatibility search endpointMilivoje Legenovic2021-01-23
|/ | | | Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
* Merge pull request #9028 from mlegenovic/masterOpenShift Merge Robot2021-01-23
|\ | | | | Accept and ignore 'null' as value for X-Registry-Auth
| * Accept and ignore 'null' as value for X-Registry-AuthMilivoje Legenovic2021-01-22
| | | | | | | | | | | | | | | | | | | | docker-client is a library written in Java and used in Eclipse to speak with Docker API. When endpoint /images/search is called, HTTP header attribute X-Registry-Auth has value "null". This is for sure wrong but Docker tolerates this value, and call works. With this patch call works also with Podman. #7857 Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
* | Merge pull request #9067 from Luap99/podman-manifest-existsOpenShift Merge Robot2021-01-23
|\ \ | | | | | | podman manifest exists
| * | podman manifest existsPaul Holzinger2021-01-22
| | | | | | | | | | | | | | | | | | Add podman manifest exists command with remote support. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #9068 from rhatdan/remoteOpenShift Merge Robot2021-01-22
|\ \ \ | |_|/ |/| | Turn on some remote test
| * | Turn on some remote testDaniel J Walsh2021-01-22
|/ / | | | | | | | | | | | | Just running through the tests that have SkipIfRemote("FIXME") and attempting to not skip. Found these tests now work. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #9050 from xcffl/doc-rm-pod-before-start-systemd-serviceOpenShift Merge Robot2021-01-22
|\ \ | |/ |/| [ci:docs] Add a notice to remove pods/containers before starting the systemd service
| * Add a notice to remove pod before starting servicexcffl2021-01-22
|/ | | | Signed-off-by: xcffl <2216902+xcffl@users.noreply.github.com>
* Merge pull request #9052 from giuseppe/set-source-to-slirp4netns-ipOpenShift Merge Robot2021-01-22
|\ | | | | rootlessport: set source IP to slirp4netns device
| * libpod: move slirp magic IPs to constsGiuseppe Scrivano2021-01-22
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * rootlessport: set source IP to slirp4netns deviceGiuseppe Scrivano2021-01-22
| | | | | | | | | | | | | | | | | | set the source IP to the slirp4netns address instead of 127.0.0.1 when using rootlesskit. Closes: https://github.com/containers/podman/issues/5138 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * vendor: update rootlesskit to v0.12.0Giuseppe Scrivano2021-01-22
|/ | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #9027 from Luap99/podman-volume-existsOpenShift Merge Robot2021-01-21
|\ | | | | Podman volume exists
| * podman volume existsPaul Holzinger2021-01-21
| | | | | | | | | | | | Add podman volume exists command with remote support. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #9053 from cevich/master_no_smoke_branchesOpenShift Merge Robot2021-01-21
|\ \ | | | | | | [CI:DOCS] Cirrus: Skip smoke task on branch-push
| * | [CI:DOCS] Cirrus: Skip smoke task on branch-pushChris Evich2021-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to re-run the same basic validation checks as were presumably already run on a PR before it merged. There are also possible problems properly determining `$EPOCH_TEST_COMMIT` when there have been no successful CI-runs on the branch (i.e. it's new). This needlessly fouls up the git-validation tool. Fix Both problems by just skipping the 'smoke' task for branches and tags. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #9046 from Luap99/fix-network-testsOpenShift Merge Robot2021-01-21
|\ \ \ | |/ / |/| | Fix e2e network test flakes
| * | Move the cni lock file into the cni config dirPaul Holzinger2021-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit(fe3faa517e1b) introduced a lock file for network create/rm calls. There is a problem with the location of the lock file. The lock file was stored in the tmpdir. Running multiple podman network create/remove commands in parallel with different tmpdirs made the lockfile inaccessible to the other process, and so parallel read/write operations to the cni config directory continued to occur. This scenario happened frequently during the e2e tests and caused some flakes. Fixes #9041 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * | Use random network names in the e2e testsPaul Holzinger2021-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the container storage all e2e test are using the same cni config directory. This causes problems if the network name already exists. Using random names will make the second run pass even if the first failed. This is only done to prevent full CI failures. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #9044 from TomSweeneyRedHat/dev/tsweeney/coc_2OpenShift Merge Robot2021-01-21
|\ \ \ | | | | | | | | [CI:DOCS] Update project name in Code of Conduct
| * | | [CI:DOCS] Update project name in Code of ConductTomSweeneyRedHat2021-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the project name from Libpod to Podman in the Code of Conduct document. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | Merge pull request #9036 from baude/composelogOpenShift Merge Robot2021-01-21
|\ \ \ \ | |_|/ / |/| | | Set log driver for compatibility containers
| * | | Set log driver for compatability containersbaude2021-01-20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using the compatibility api to create containers, now reflect the use of k8s-file as json-file so that clients, which are unaware of k8s-file, can work. specifically, if the container is using k8s-file as the log driver, we change the log type in container inspection to json-file. These terms are used interchangably in other locations in libpod/podman. this fixes log messages in compose as well. [NO TESTS NEEDED] Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #9014 from rhatdan/rmOpenShift Merge Robot2021-01-20
|\ \ \ | |/ / |/| | Fix handling of container remove
| * | Fix handling of container removeDaniel J Walsh2021-01-20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found several problems with container remove podman-remote rm --all Was not handled podman-remote rm --ignore Was not handled Return better errors when attempting to remove an --external container. Currently we return the container does not exists, as opposed to container is an external container that is being used. This patch also consolidates the tunnel code to use the same code for removing the container, as the local API, removing duplication of code and potential problems. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>