Commit Graph

85 Commits

Author SHA1 Message Date
Jindrich Novy
c8fda2b083 Sync with containers-common 0.60.0
Resolves: RHEL-45611

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2024-07-29 10:59:50 +02:00
Lokesh Mandvekar
b3fe2ab30d
remove cni-plugins dependency
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2024-02-07 22:40:34 +05:30
Lokesh Mandvekar
50f9d7ee6e
bump netavark dep 2024-02-01 17:47:36 +05:30
Lokesh Mandvekar
9a27ad528d
bump to v0.57.3
check if `short-name-mode="enforcing"` exists in registries.conf and
enabled.

Remove `-e` option from update.sh to not exit on non-zero error at
finding `short-name-mode="enforcing"`.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2024-02-01 17:16:21 +05:30
Yaakov Selkowitz
2dcf69d1ad Build only on golang arches
go-md2man is a build requirement, and is therefore limited by golang
arches, and therefore does not build on i686 in RHEL 10.  The build
arches can be limited while still remaining a noarch RPM.
2024-01-30 13:50:17 +00:00
Daniel J Walsh
719145eb7e
local build 2024-01-29 12:32:34 -05:00
Lokesh Mandvekar
1c296038d7
Use c/common upstream version for rpm with Epoch bump
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2254254

Keeping the Version set to `1` with autorelease can cause installation
issues.

With this commit, the c/common upstream version will be used for rpm
version so that there will be regular rpm version changes. Packages
dependent on containers-common can then use `>= epoch:version` for
dependency resolution.

Another change with this commit is that `update.sh.rawhide` has been
removed and all the rawhide specific logic has been added to `update.sh`
itself.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2024-01-05 16:27:34 +05:30
Daniel J Walsh
28c879f872
local build 2023-12-10 08:34:23 -05:00
Lokesh Mandvekar
3226e0bbf2 extra subpackage depends netavark v1.6.0 or higher
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2023-04-12 08:18:10 -04:00
Lokesh Mandvekar
1b174b2d24 Resolves: #2170856 - add passt dependency
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2023-02-21 20:08:23 +05:30
Dan Čermák
61b3559cc5
Switch License to SPDX 2023-02-14 13:47:26 +01:00
Lokesh Mandvekar
1fb192fdd2 Suggests: qemu-user-static superseded by Recommends
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2023-02-01 17:53:20 +05:30
Lokesh Mandvekar
3e3fef6f50 adjust qemu-user-static dependencies in containers-common-extra
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2023-01-31 17:47:38 +05:30
Alexander Larsson
e3a882a033 Add /etc/containers/systemd and /usr/share/containers/systemd dirs
These are used by podman-quadlet which is part of podman 4.4
2023-01-04 11:26:29 +01:00
Daniel J Walsh
fc6ba2bd58
Change container-selinux to a recommends
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-12-15 15:02:49 -05:00
Lokesh Mandvekar
c30138dcb3 install RPM-GPG-KEY-redhat-release only on fedora and centos environments
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-11-02 17:16:08 +05:30
Lokesh Mandvekar
a193cab991 add cni-plugins and qemu-user-static deps to containers-common-extra
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-10-06 15:39:11 -04:00
Lokesh Mandvekar
b1f62551f7 both buildah and podman require iptables and nftables
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-10-06 15:35:19 -04:00
Lokesh Mandvekar
7f25686ec2 add containers-common-extra subpackage
The extra subpackage will contain those dependencies for Podman and Buildah
which are not required by Skopeo.

There are also additional conditionals to handle dependencies on Fedora
Server.

Podman and Buildah will `Requires: containers-common-extra` going
forward while Skopeo will ocntinue to `Requries: containers-common`.

Also added comment about origin of SourceN files.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-10-06 15:21:26 -04:00
Lokesh Mandvekar
b4c18e3bd5 remove debbuild macros to comply with fedora guidelines
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-10-04 14:40:52 -04:00
Lokesh Mandvekar
554dba3090 deb envs probably need an explicit provides, whatevs
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-09-23 14:20:35 -04:00
Lokesh Mandvekar
40204168e1 obsolete and provide golang-github-containers-[common|image] = %{epoch}:%{version}-%{release}
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-09-23 14:16:13 -04:00
Lokesh Mandvekar
e552008fb8 obsolete golang-github-containers-common in debian and ubuntu
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-09-23 14:01:30 -04:00
Lokesh Mandvekar
410c4871bc Fix debbuild maintainer field issue
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-08-16 14:25:01 -04:00
Lokesh Mandvekar
ae3afe5c2a debbuild package conflicts with golang-github-containers-common
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-08-16 14:23:45 -04:00
Lokesh Mandvekar
c4f47308b7 Revert "skip RPM-GPG-KEY-redhat-release installation on non-centos RHEL"
Bad commit

This reverts commit 3f652c6781.
2022-06-13 11:28:16 -04:00
Lokesh Mandvekar
3f652c6781 skip RPM-GPG-KEY-redhat-release installation on non-centos RHEL
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-06-13 10:09:09 -04:00
Lokesh Mandvekar
48a46928b8 build deb packages using debbuild
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-05-27 11:10:28 -04:00
Daniel J Walsh
b2a34f0c7f
local build 2022-03-23 10:48:56 -04:00
Lokesh Mandvekar
0ae1cfd00e comment out log_driver for rhel8 on copr
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-03-15 11:07:27 -04:00
Lokesh Mandvekar
0a61fed140 fix build - don't delete what doesn't exist
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-02-14 14:15:39 -05:00
Lokesh Mandvekar
418b00e604 temporarily remove dockerfile manpages
https://github.com/fedora-silverblue/issue-tracker/issues/239

Handle this better in a subsequent build.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-02-14 14:06:19 -05:00
Lokesh Mandvekar
7a77249545 Revert "handle md2man dep for c9s"
This reverts commit 75a6342663.

Looks like we don't need it for c9s as netavark builds just fine on
copr without this change.
2022-02-03 11:30:14 -05:00
Lokesh Mandvekar
75a6342663 handle md2man dep for c9s
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-02-03 10:52:32 -05:00
Lokesh Mandvekar
d16e5dd7d0 Check for docker manpage existence in %post
The post install script should check for prior Dockerfile and
dockerignore manpages on the system before creating them and not depend
on the existence of /usr/bin/docker or the lack of it.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-02-02 15:41:50 -05:00
Lokesh Mandvekar
2d5f45149b resolve docker manpage conflicts
With this change, docker manpages will be generated at rpm install time
via %post only if %{_bindir}/docker isn't found on the system.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-02-01 15:45:14 -05:00
Lokesh Mandvekar
69b9328f17 no error if man5 exists
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-01-28 14:04:09 -05:00
Lokesh Mandvekar
501fc6f18d install containerfile and dockerfile manpages
Along with this change:

the podman package should get rid of:
`Dockerfile.5.gz`
`dockerignore.5.gz`
`.dockerignore.5.gz`

the buildah package should get rid of:
`Containerfile.5.gz`
`containerignore.5.gz`
`.containerignore.5.gz`

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-01-28 19:01:46 +00:00
Lokesh Mandvekar
8f21e603b4 Depend on container-network-stack and switch to autospec
This change will also recommend netavark.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-01-24 15:30:20 -05:00
Fedora Release Engineering
c1bf721fcb - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 23:48:05 +00:00
Daniel J Walsh
651c273ad7
Update to grab latest man pages and configuration files 2021-12-20 09:26:29 -05:00
Daniel J Walsh
069e792db0
Update to grab latest man pages and configuration files
Move /etc/containers/containers.conf to /usr/share/containers/containers.conf
2021-11-29 15:30:01 -05:00
Daniel J Walsh
4f274507d0
Update to grab latest man pages and configuration files 2021-11-08 07:32:58 -05:00
Daniel J Walsh
a0c17419b4
Update to grab latest man pages and configuration files 2021-10-21 09:51:45 -04:00
Daniel J Walsh
8b8f89c567
Update to grab latest man pages and configuration files 2021-10-07 08:51:51 -04:00
Daniel J Walsh
325ba8f081
Add .containerignore.5 link 2021-10-05 17:07:11 -04:00
Daniel J Walsh
b99309d7d7
Update to grab latest man pages and configuration files
Add Containerfile.md
Add containerignore.md
2021-10-01 15:17:19 -04:00
Daniel J Walsh
fbcbaa5ba3
Update to grab latest man pages and configuration files
Add containerfile.md
2021-09-26 09:18:58 -04:00
Daniel J Walsh
043d6c2a3e
Update to grab latest man pages and configuration files 2021-09-20 14:56:51 -04:00
Daniel J Walsh
fa943c8e49
Update to grab latest man pages and configuration files 2021-09-14 14:59:28 -04:00