19797 Commits

Author SHA1 Message Date
c193dbd942 Require a non-generic reason for non-Fedora skip
Signed-off-by: Chris Evich <cevich@redhat.com>
2023-08-08 14:34:24 -04:00
d79e3a23db CI FIXME removal/update.
Ref: https://github.com/containers/automation_images/pull/288/commits

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-08-08 14:34:24 -04:00
5ec856652f Update dependency containers/automation_images to v20230807
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Chris Evich <cevich@redhat.com>
2023-08-08 11:09:28 -04:00
1899d21212 Merge pull request #19544 from NitrogenUA/build-docs
[CI:DOCS] fixed couple typos in build docs
2023-08-08 11:01:40 -04:00
c13b403c0f Merge pull request #19534 from giuseppe/cp-close-tmp-file
cp: close temporary file on error path
2023-08-08 08:38:06 -04:00
406c480535 Merge pull request #19533 from hangscer8/fix_waitPidStop_timer
Stop timer in function waitPidStop
2023-08-08 06:59:20 -04:00
8a410784b4 [CI:DOCS] fixed couple typos in build docs
Signed-off-by: Oleh Dmytrychenko <dmytrychenko.oleh@gmail.com>
2023-08-08 12:57:43 +03:00
cc31ac4b0e Merge pull request #19530 from mheon/fix_19529
Ensure volumes-from mounts override image volumes
2023-08-08 04:55:11 -04:00
2f50d8e579 Merge pull request #19425 from rhatdan/service
Add support for passing container stop timeout as -1 (infinite)
2023-08-08 04:52:33 -04:00
282594e58f Stop timer in function waitPidStop
Because it will cause memory leak if we do not stop timer when the function has completed.

[NO NEW TESTS NEEDED]

Signed-off-by: hang.jiang <hang.jiang@daocloud.io>
2023-08-08 16:31:27 +08:00
2e97c6616d Merge pull request #19537 from ygalblum/quadlet-network-doc
[CI:DOCS] Quadlet - provide more information about network files
2023-08-07 16:14:39 -04:00
2de22ebf0d Ensure volumes-from mounts override image volumes
We do not allow volumes and mounts to be placed at the same
location in the container, with create-time checks to ensure this
does not happen. User-added conflicts cannot be resolved (if the
user adds two separate mounts to, say, /myapp, we can't resolve
that contradiction and error), but for many other volume sources,
we can solve the contradiction ourselves via a priority
hierarchy. Image volumes come first, and are overridden by the
`--volumes-from` flag, which are overridden by user-added mounts,
etc, etc. The problem here is that we were not properly handling
volumes-from overriding image volumes. An inherited volume from
--volumes-from would supercede an image volume, but an inherited
mount would not. Solution is fortunately simple - just clear out
the map entry for the other type when adding volumes-from
volumes.

Makes me wish for Rust sum types - conflict resolution would be a
lot simpler if we could use a sum type for volumes and bind
mounts and thus have a single map instead of two maps, one for
each type.

Fixes #19529

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2023-08-07 15:04:33 -04:00
f6c2be918d Merge pull request #19539 from cevich/minor_gha_updates
[CI:DOCS] Minor mac/windows GHA workflow updates
2023-08-07 13:58:58 -04:00
03d7a5120c Minor: Include shasums in GHA workflow artifacts
This may be helpful in case SHA comparison is needed w/ files elsewhere.
For example, the files uploaded to a github release page.

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-08-07 11:42:39 -04:00
d63ac06521 Minor: Add important comment to windows GHA workflow
Ref:
https://github.com/containers/podman/pull/19418#issuecomment-1665938019

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-08-07 11:37:33 -04:00
9d7fe4e90f Minor: Update/fix dry-run input descriptions
These are visible when running either job manually.  Fix the windows
workflow by including a `v` prefix to an obviously fictitious version
number.  For consistency, update the mac workflow text to match.

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-08-07 11:30:32 -04:00
518daef729 [CI:DOCS] Quadlet - provide more information about network files
Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
2023-08-07 16:53:40 +03:00
b3a2ce3dc1 Merge pull request #19535 from edsantiago/manpage_dups
[CI:DOCS] man-page xref: check for duplicate entries
2023-08-07 15:07:10 +02:00
d56b61ef4a Merge pull request #19532 from dfr/freebsd-build
Makefile: work around the lack of 'man -l' on FreeBSD
2023-08-07 15:04:38 +02:00
819129b0d7 man-page xref: check for duplicate entries
Check for duplicate subcommands, flags, and format specifiers.
I assumed this would never be necessary, that code review would
catch dups, but it happened (#19462). Prevent future ones.

Also, make it a fatal error for a --format to be undocumented,
except for 'podman inspect'. So many exceptions ... :(

Signed-off-by: Ed Santiago <santiago@redhat.com>
2023-08-07 05:52:20 -06:00
39641482c1 cp: close temporary file on error path
follow-up for https://github.com/containers/podman/pull/19526

on io.Copy() errors make sure the temporary file is closed.

[NO NEW TESTS NEEDED]

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2023-08-07 12:39:25 +02:00
c04ead152e Merge pull request #19522 from containers/renovate/golang.org-x-net-0.x
Update module golang.org/x/net to v0.14.0
2023-08-07 12:25:41 +02:00
c3cab72065 Merge pull request #19526 from HirazawaUi/fix-not-remove-tempfile
remove temporary files when copy
2023-08-07 12:23:08 +02:00
018fdb48ed Makefile: work around the lack of 'man -l' on FreeBSD
The mandoc(1) utility is used for this on FreeBSD systems. This fixes a
confusing (but harmless) series of error messages when building manpages
on FreeBSD.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2023-08-07 10:36:15 +01:00
e9a3b7cfa1 Merge pull request #19531 from dfr/freebsd-kube
libpod: fix a crash in 'kube generate' on FreeBSD
2023-08-07 11:13:25 +02:00
0b7769fdae Update module golang.org/x/net to v0.14.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-07 07:52:57 +00:00
ec5a9b9cc7 libpod: fix a crash in 'kube generate' on FreeBSD
For containers using host networking, 'kube generate' crashed in
(*Container).HostNetwork which dereferenced config.Spec.Linux without
checking if its non-nil, which is the case for FreeBSD containers.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2023-08-07 08:16:48 +01:00
23c5890f25 remove temporary files when copy
[NO NEW TESTS NEEDED]

Fixes: #19496

Signed-off-by: binghongtao <695097494plus@gmail.com>
2023-08-06 23:12:54 +08:00
eceae9da57 Merge pull request #19478 from dcermak/show-socket-exists
Always show RemoteSocket.Exists in json
2023-08-05 12:37:52 +02:00
38b20bda29 Merge pull request #19510 from baude/errorifkeyexists
Fail if ssh key exists
2023-08-05 12:27:14 +02:00
0ad376d921 Merge pull request #19514 from containers/renovate/golang.org-x-sys-0.x
Update module golang.org/x/sys to v0.11.0
2023-08-05 04:42:25 +02:00
78351cab88 Merge pull request #19509 from lsm5/main-version
[CI:BUILD] Makefile: rpm target generates correct version
2023-08-05 04:39:52 +02:00
9e18e9fafd Merge pull request #19414 from rhatdan/systemd
Deprecate podman generate systemd
2023-08-04 20:06:41 +02:00
fab62f816d Update module golang.org/x/sys to v0.11.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-04 17:15:05 +00:00
1304162b1c Merge pull request #19512 from baude/userkeyswitch
Fix regression for hyperv
2023-08-04 19:13:50 +02:00
1384c30a9a Merge pull request #19501 from jakecorrenti/fix-machine-consolidation-nits
Fix nits in #19480
2023-08-04 17:17:25 +02:00
b46d72fece [ci] Remove the podman socket in remove_packaged_podman_files()
The socket can already exist and is not removed by disabling the systemd unit,
hence it needs to be deleted to get a "vanilla" system. This is a temporary
workaround suggested in:
https://github.com/containers/podman/pull/19478#issuecomment-1665350945

[NO NEW TESTS NEEDED] - this is a CI fix

Signed-off-by: Dan Čermák <dcermak@suse.com>
2023-08-04 16:30:55 +02:00
706c51b52b [ci] Correct the podman systemd file names
[NO NEW TESTS NEEDED] - this is a CI fix

Co-authored-by: Chris Evich <cevich@redhat.com>

Signed-off-by: Dan Čermák <dcermak@suse.com>
2023-08-04 16:24:58 +02:00
dd4f47dd98 Always show RemoteSocket.Exists in json
The `Exists` field of the `RemoteSocket` struct is marshaled to json with the
`omitempty` setting. This has the disadvantage that by default `podman info`
shows a `remotePath` entry (the remote path is set in
`pkg/domain/infra/abi/systems.go`: `(*ContainerEngine).Info`) but not that this
path does not exist:
```
❯ podman info --format json | jq .host.remoteSocket
{
  "path": "/run/user/1000/podman/podman.sock"
}
```

By removing the `omitempty`, we ensure that the existence is always shown:
```
❯ bin/podman info --format json | jq .host.remoteSocket
{
  "path": "/run/user/1000/podman/podman.sock",
  "exists": false
}
```

Signed-off-by: Dan Čermák <dcermak@suse.com>
2023-08-04 16:24:58 +02:00
fc7c6efd3b Fail if ssh key exists
when init'ing a machine, if the ssh key already exists, then we get a
somewhat oblique error.  here we make it clear what the problem was and
early return.

Signed-off-by: Brent Baude <bbaude@redhat.com>

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-08-04 09:13:50 -05:00
69e883493b Fix regression for hyperv
the method caller for creating the ignition file was accidently
misordered for hyperv.  this regression was caused by aa6827a6.

Signed-off-by: Brent Baude <bbaude@redhat.com>

[NO NEW TESTS NEEDED]
2023-08-04 09:10:10 -05:00
803a49da46 [CI:BUILD] Makefile: rpm target generates correct version
`git describe` is lagging on main so this commit updates
`rpm/update-sepc-version.sh` to generate the expected version.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2023-08-04 09:52:16 -04:00
1a63c1b23e Fix nits in #19480
Fixes non-blocking nits that were in the PR that consolidated some of
the machine code into common areas.

Fixes a capitalization error in documentation, inverts the logic in
`AddSSHConnectionsToPodmanSocket`, and uses raw strings in
`WaitAPIAndPrintInfo` instead of printing the messages line-by-line.

[NO NEW TESTS NEEDED]

Signed-off-by: Jake Correnti <jakecorrenti+github@proton.me>
2023-08-04 09:28:20 -04:00
1e54539432 Add support for passing container stop timeout as -1 (infinite)
Compat api for containers/stop should take -1 value

Add support for `podman stop --time -1`
Add support for `podman restart --time -1`
Add support for `podman rm --time -1`
Add support for `podman pod stop --time -1`
Add support for `podman pod rm --time -1`
Add support for `podman volume rm --time -1`
Add support for `podman network rm --time -1`

Fixes: https://github.com/containers/podman/issues/17542

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-08-04 08:36:45 -04:00
0fb5b3acf0 Merge pull request #19483 from dfr/freebsd-devices
pkg/specgen: Add device support for FreeBSD
2023-08-04 14:35:33 +02:00
1440985877 Merge pull request #19505 from eriksjolund/fix_issue_19462_remove_duplicate_lastup_from_man_page
[CI:DOCS] man: remove duplicate entry `.LastUp`
2023-08-04 11:36:50 +02:00
d50054f1e4 pkg/specgen: Add device support for FreeBSD
On FreeBSD, each container has its own devfs instance with a ruleset
that controls what the container can see. To expose devices to a
container we add rules to its devfs to make the requested devices
visible. For privileged containers, we use 'ruleset=0' which makes
everything visible.

This shares the ParseDevice function with Linux so it moves to
config_common.go from config_linux.go.

Signed-off-by: Doug Rabson <dfr@rabson.org>
2023-08-04 10:11:14 +01:00
f5058f1483 [CI:DOCS] man: remove duplicate entry .LastUp
Fixes: https://github.com/containers/podman/issues/19462

Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
2023-08-04 08:47:08 +02:00
84dec22349 Merge pull request #19494 from rhatdan/codespell
Run codespell on code
2023-08-03 19:32:27 +02:00
92090d6acc Merge pull request #19310 from cgiradkar/fix_dash_t_flag
Check tty flag to set default terminal in Env
2023-08-03 18:49:51 +02:00