summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix static build cache by using cachixSascha Grunert2021-01-27
| | | | | | | | | | | | | | | | | | | | It looks like we always hit the caching issue in Cirrus CI described within #8313. A solution around that is to use cachix, which has been pre-populated from my local machine. To push all (runtime and build) dependencies, we can leverage a pre-populated store by: ``` > nix-store -qR --include-outputs $(nix-instantiate nix/default.nix) | cachix push podman ``` The cache can be re-used by everybody to rapidly build static Podman binaries: https://app.cachix.org/cache/podman [NO TESTS NEEDED] Signed-off-by: Sascha Grunert <mail@saschagrunert.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>
* | Merge pull request #9035 from Luap99/fix-9034OpenShift Merge Robot2021-01-20
|\ \ | | | | | | Make generate systemd --new robust against double curly braces
| * | Make generate systemd --new robust against double curly bracesPaul Holzinger2021-01-20
| |/ | | | | | | | | | | | | | | | | | | | | If the container create command contains an argument with double curly braces the golang template parsing can fail since it tries to interpret the value as variable. To fix this change the default delimiter for the internal template to `{{{{`. Fixes #9034 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #9020 from vrothberg/fix-9000OpenShift Merge Robot2021-01-20
|\ \ | |/ |/| make bindings generation more robust
| * Cirrus: add bindings checksValentin Rothberg2021-01-20
| | | | | | | | | | | | | | | | | | Make sure that bindings are in sync with the code. The check is similar to what's already being done with `make vendor`, so integrate the two. [NO TESTS NEEDED] Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * make bindings generation explicitValentin Rothberg2021-01-20
| | | | | | | | | | | | | | | | Instead of implicitly generating the bindings, make it explicit, similar to `make vendor`. This should prevent redundant and possibly error prone generations. A following commit will shield CI. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * make bindings generation more robutsValentin Rothberg2021-01-20
|/ | | | | | | | | | | | | | | | | | The Go gods did not shine upon us trying to understand what's going on in #9000. The symptom is that `go generate` did not add required imports to a generated file, ultimately breaking subsequent compilation. While it still remains unclear *why* Go is behaving like that, the symptom disappears when `go generate` runs in module mode; that is without `-mod=vendor` and without `GO111MODULE=off`. This was reproducible on two separate machines (Ubuntu and Fedora). Also, when facing an unset GOPATH, set it to Go's default (i.e., $HOME/go) and make sure that GOBIN is in PATH since `goimports` is required by `go generate`. Fixes: #9000 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #9031 from vrothberg/revert-ginkgoOpenShift Merge Robot2021-01-20
|\ | | | | Revert "ginkgo: install on demand via `go get -u`"
| * Revert "ginkgo: install on demand via `go get -u`"Valentin Rothberg2021-01-20
| | | | | | | | | | | | | | | | | | | | This reverts commit de05e5816869073600ae8e851093b4b9a9d7fab0. Running `go get -u` will change the local Go module causing CI to fail as the local git tree is being changed. Reverting the change for now until we have a better idea. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #8911 from edsantiago/prs_must_include_testsOpenShift Merge Robot2021-01-20
|\ \ | |/ |/| CI: smoke test: insist on adding tests on PRs
| * CI: smoke test: insist on adding tests on PRsEd Santiago2021-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On each PR (with a few exceptions), check the list of git-touched files, and abort if no tests are added. Include instructions on how to bypass the check if tests really aren't needed. Include a hardcoded exception list for PRs that only touch a well-known subset of "safe" files: docs, .cirrus.yml, vendor, version, hack, contrib, or *.md. This list is likely to need tuning over time. Add a test suite, but not one recognized by the new script (because it's a "*.t" file), so: [NO TESTS NEEDED] Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #9021 from Luap99/podman-network-existsOpenShift Merge Robot2021-01-19
|\ \ | | | | | | podman network exists
| * | podman network existsPaul Holzinger2021-01-19
| | | | | | | | | | | | | | | | | | Add podman network exists command with remote support. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #9023 from edsantiago/fix_gomd2man_warningsOpenShift Merge Robot2021-01-19
|\ \ \ | | | | | | | | [CI:DOCS] fix go-md2man HTMLSpan warnings
| * | | [CI:DOCS] fix go-md2man HTMLSpan warningsEd Santiago2021-01-19
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm tired of seeing these every time I run 'make': WARNING: go-md2man does not handle node type HTMLSpan Cause: left-angle-brackets ( < ) in document source Solution: 1) backquote-escape those that need to be shown, usually ones referring to an argument or email address; or 2) Actual HTML ( <sup> and <a> ) which are meant to be shown in generated HTML docs but can't be shown in man pages, we filter out via a sed expression. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #9008 from edsantiago/release_deal_with_set_minus_eOpenShift Merge Robot2021-01-19
|\ \ \ | |/ / |/| | runner.sh : deal with bash 'set -e'
| * | runner.sh : deal with bash 'set -e'Ed Santiago2021-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release trigger script failed[1] because the entire script runs under 'set -e'; so a 'grep -- -dev' that finds no results will cause a nonzero exit status and hence the entire script to fail. Work around that. [1] https://cirrus-ci.com/task/4541290882793472 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #9004 from baude/existsoptionsOpenShift Merge Robot2021-01-19
|\ \ \ | | | | | | | | Add binding options for container|pod exists
| * | | Add binding options for container|pod existsbaude2021-01-18
| | |/ | |/| | | | | | | | | | | | | | | | | | | It turns out an options was added to container exists so it makes sense to have pods and container exists calls have an optional structure for options. Signed-off-by: baude <bbaude@redhat.com>