Compare commits

...
Sign in to create a new pull request.

63 commits

Author SHA1 Message Date
Lokesh Mandvekar
5840f03527 no min version requirement on runc for centos
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-02-12 20:06:55 -05:00
RH Container Bot
0235e90b88 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 11:11:24 +00:00
RH Container Bot
4ef281656f podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 10:11:44 +00:00
RH Container Bot
2404379b4f podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 09:12:10 +00:00
RH Container Bot
5cc1730e7e podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 08:11:15 +00:00
RH Container Bot
341a1f9757 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 07:10:29 +00:00
RH Container Bot
6a20051cd7 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 06:11:16 +00:00
RH Container Bot
5a111af584 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 05:11:10 +00:00
RH Container Bot
5da5b1be27 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 04:28:26 +00:00
RH Container Bot
5764bc9eff podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 03:10:41 +00:00
RH Container Bot
4a41bf1da5 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 02:11:26 +00:00
RH Container Bot
02fe236668 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 01:11:25 +00:00
RH Container Bot
eaaf25899d podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-08 00:09:36 +00:00
RH Container Bot
04898a3b50 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-07 23:09:35 +00:00
RH Container Bot
9809d0f98f podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-07 22:37:52 +00:00
RH Container Bot
d78d741879 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-07 22:26:37 +00:00
RH Container Bot
710914e79c podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-07 22:09:43 +00:00
RH Container Bot
194ad3b3ee podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-07 22:03:52 +00:00
RH Container Bot
d297d054af podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-07 21:09:34 +00:00
RH Container Bot
3e12549aab podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-07 20:09:56 +00:00
RH Container Bot
cc155853f2 podman-2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-07 20:01:46 +00:00
Lokesh Mandvekar
7bae89e0f1 keep remote manpages for fedora
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-02-07 14:29:14 -05:00
Lokesh Mandvekar
a136e565f6 podman-2:1.8.0-0.2
- bump crun dependency

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-02-06 11:28:22 -05:00
Lokesh Mandvekar
fc17da38ee do not install remote files for centos7
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-02-06 06:50:12 -05:00
Lokesh Mandvekar
e957fe4a22 adjust build steps for happy CentOS builds on OBS
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-02-04 16:56:10 -05:00
Lokesh Mandvekar
6676d817bc built v1.8.0-rc1
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-02-03 15:14:17 -05:00
Lokesh Mandvekar
d3487efebb set Epoch:0 for centos
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-02-03 10:46:53 -05:00
Lokesh Mandvekar
518b0a49bc no ostree/btrfs deps for centos
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-02-03 10:38:48 -05:00
Lokesh Mandvekar
5a94bec9eb adjust macros and deps for OBS build
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-02-03 10:31:01 -05:00
Jindrich Novy
f89b62d924 podman-1.7.0-2.fc31
- require container-selinux only when selinux-policy is installed and
  move podman-remote man pages to dedicated package (#1765818)

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2020-01-08 15:04:21 +01:00
RH Container Bot
32767aad7c podman-2:1.7.0-2
- bump to v1.7.0
- autobuilt b7ce115

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-01-07 17:10:26 +00:00
Jindrich Novy
edde6e2d14 podman-1.7.0-0.5.rc2.fc31
- merge podman-manpages with podman package
- require container-selinux (#1765818)
- minor spec file updates

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2020-01-07 12:12:48 +01:00
Lokesh Mandvekar
4f889b68ed use correct rc tag
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-01-06 23:57:23 +05:30
RH Container Bot
065e89cb60 podman-2:1.7.0-0.3.rc1
- bump to v1.7.0-rc2
- autobuilt 9090c47

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-01-02 21:10:24 +00:00
RH Container Bot
5b7f6b6736 podman-2:1.7.0-0.2.rc1
- bump to v1.7.0-rc1
- autobuilt 7bbef41

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2019-12-11 19:11:12 +00:00
Lokesh Mandvekar
0b5720b3e2 add podman-plugins subpackage
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-11-08 08:03:10 -05:00
Lokesh Mandvekar
d0bbca11cb package podman-plugins
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-11-08 07:44:21 -05:00
Lokesh Mandvekar
30961a1dce go-md2man for CentOS
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2019-10-30 12:29:10 +00:00
Lokesh Mandvekar
62e7cee155 podman-1.6.2-3
- crun only for fedora ATM

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2019-10-30 12:24:21 +00:00
RH Container Bot
14a7b4e64d podman-2:1.6.2-2
- bump to v1.6.2
- autobuilt f3ffda1

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2019-10-17 22:16:51 +00:00
RH Container Bot
3af39e2b4b podman-2:1.6.2-0.2.rc1
- bump to v1.6.2-rc1
- autobuilt 4d653f0

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2019-10-16 20:47:57 +00:00
Lokesh Mandvekar
83bdcd3fba remove polkit dependency for now
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-09 11:49:14 -04:00
Ed Santiago
342a69f147 Gating tests: use loginctl, dump env
- instead of hacky mkdir /run/user/<fedora id>,
  use loginctl enable-linger and hope that it
  has the same effect.

  reason: the mkdir doesn't seem to be 100% effective.
  There are cases in which the first rootless podman
  invocation fails with:

    Error: could not get runtime: cannot mkdir /run/user/1000/libpod: mkdir /run/user/1000/libpod: no such file or directory

- for future spelunking, dump environment at start
  of each test (both root and rootless). Suggested
  by Giuseppe.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-10-09 08:10:13 -06:00
Lokesh Mandvekar
0de3dfb40b podman-2:1.6.1-4
- Requires: crun >= 0.10.2-1 and polkit

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-09 08:45:17 -04:00
Lokesh Mandvekar
93be2ffa71 podman-2:1.6.1-3
- add Recommends: runc for fedora

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-08 13:22:53 -04:00
Ed Santiago
d229c2ff42 gating tests: log important package versions
Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-10-03 08:28:31 -06:00
RH Container Bot
5bea0ed1c3 podman-2:1.6.1-2
- bump to v1.6.1
- autobuilt 233d95f

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2019-10-02 23:17:14 +00:00
RH Container Bot
093482789d podman-2:1.6.1-0.2.rc1
- bump to v1.6.1-rc1
- autobuilt a2fdb6e

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2019-10-02 17:46:27 +00:00
Lokesh Mandvekar
2c8ac7d50d Requires: crun >= 0.10-1
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-01 15:50:44 -04:00
Lokesh Mandvekar
e086da63a3 remove release tag warning for rawhide
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-01 14:28:27 -04:00
Lokesh Mandvekar
6afb9967fc bump release tag
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-01 14:27:06 -04:00
RH Container Bot
3cb26646a5 podman-2:1.6.0-2
- bump to v1.6.0
- autobuilt b02b072

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2019-10-01 18:16:55 +00:00
RH Container Bot
e5eeb0cea6 podman-2:1.6.0-0.2.rc2.git9181c65
- bump to v1.6.0-rc2
- autobuilt 9181c65

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2019-09-25 19:27:38 +00:00
Lokesh Mandvekar (Bot)
0e6209bc57 podman-2:1.6.0-2.gitca5ff03
- bump to v1.6.0-rc1
- autobuilt ca5ff03

Signed-off-by: Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org>
2019-09-17 19:07:07 +00:00
Lokesh Mandvekar
b8f783b7b6 podman-2:1.5.1-3.git0005792
- use v1.15.1 tag
- use conmon package as runtime dep

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-09-15 04:30:13 +05:30
Daniel J Walsh
38b752b0d6
Grab specific version of crun or newer. 2019-09-13 11:01:01 -04:00
Ed Santiago
48f430129c Enable gating tests on f31
Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-09-10 14:56:06 -06:00
Daniel J Walsh
70326cd698
Require crun rather then runc
Switch to crun by default for cgroupsV2 support
2019-08-27 16:04:08 -04:00
Daniel J Walsh
5a1e6e145f
Move man5 man pages into podman-manpage package 2019-08-22 14:10:11 -04:00
Lokesh Mandvekar
201e671fc2 update built_tag macro for autobuilds
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-08-16 17:38:24 +05:30
Daniel J Walsh
2fc6021c63
Add recommends libvarlink-util 2019-08-13 15:05:20 -04:00
Daniel J Walsh
0a5dc0c786
Add recommends libvarlink-util 2019-08-13 14:27:20 -04:00
Daniel J Walsh
ae49d0a9fe
Add recommends libvarlink-util 2019-08-13 14:17:57 -04:00
6 changed files with 348 additions and 81 deletions

16
.gitignore vendored
View file

@ -384,3 +384,19 @@
/libpod-f634fd3.tar.gz
/libpod-c48243e.tar.gz
/libpod-031437b.tar.gz
/libpod-7a859f0.tar.gz
/libpod-ce64c14.tar.gz
/libpod-0005792.tar.gz
/libpod-ca5ff03.tar.gz
/libpod-9181c65.tar.gz
/libpod-b02b072.tar.gz
/libpod-a2fdb6e.tar.gz
/libpod-233d95f.tar.gz
/libpod-4d653f0.tar.gz
/libpod-f3ffda1.tar.gz
/dnsname-f5af33d.tar.gz
/libpod-7bbef41.tar.gz
/libpod-9090c47.tar.gz
/libpod-b7ce115.tar.gz
/v1.8.0-rc1.tar.gz
/v1.8.0.tar.gz

6
gating.yaml Normal file
View file

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_testing
rules:
- !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.complete}

View file

@ -1,17 +1,21 @@
%global with_devel 0
%global with_bundled 1
%global with_debug 1
%global with_check 0
%global with_unit_test 0
%if 0%{?fedora}
%if 0%{?fedora} || 0%{?centos} >= 8
#### DO NOT REMOVE - NEEDED FOR CENTOS
%bcond_without varlink
%define gogenerate go generate
%else
%bcond_with varlink
%endif
%if 0%{?fedora}
%global with_debug 1
%else
%global with_debug 0
%endif
%if 0%{?with_debug}
%global _find_debuginfo_dwz_opts %{nil}
%global _dwz_low_mem_die_limit 0
@ -19,75 +23,88 @@
%global debug_package %{nil}
%endif
%global provider github
%global provider_tld com
%global project containers
%global repo libpod
# https://github.com/containers/libpod
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
%global commit0 031437bf5b19b5121224cdec301dd9945f38e610
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%if ! 0%{?gobuild:1}
%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
%endif
%define gogenerate go generate
%global import_path_conmon github.com/containers/conmon
%global git_conmon https://%{import_path_conmon}
%global commit_conmon e217fdff82e0b1a6184a28c43043a4065083407f
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
%define provider github
%define provider_tld com
%define project containers
%define repo libpod
# https://github.com/containers/libpod
%define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%define import_path %{provider_prefix}
%define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
%define commit0 2ced9094d4728dd09f60a177faa32339a8d0f721
%define shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%define repo_plugins dnsname
# https://github.com/containers/libpod
%define import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins}
%define git_plugins https://github.com/containers/dnsname
%define commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe
%define shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7})
# Used for comparing with latest upstream tag
# to decide whether to autobuild (non-rawhide only)
%global built_tag v1.4.4
%define built_tag v1.8.0
%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
%define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz
Name: podman
%if 0%{?fedora}
Epoch: 2
%else
Epoch: 0
%endif
Version: 1.5.1
# Rawhide almost always ships unreleased builds,
# so release tag should be of the form 0.N.blahblah
Release: 0.14.dev.git%{shortcommit0}%{?dist}
Version: 1.8.0
Release: 2%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
URL: https://%{name}.io/
Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz
Source1: %{git_conmon}/archive/%{commit_conmon}/conmon-%{shortcommit_conmon}.tar.gz
Source0: %{download_url}
Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz
Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release}
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: btrfs-progs-devel
BuildRequires: golang
BuildRequires: glib2-devel
BuildRequires: glibc-devel
BuildRequires: glibc-static
BuildRequires: git
BuildRequires: golang-github-cpuguy83-md2man
BuildRequires: go-md2man
BuildRequires: gpgme-devel
BuildRequires: libassuan-devel
BuildRequires: libgpg-error-devel
BuildRequires: libseccomp-devel
BuildRequires: libselinux-devel
BuildRequires: ostree-devel
BuildRequires: pkgconfig
BuildRequires: make
BuildRequires: systemd
BuildRequires: systemd-devel
Requires: runc >= 2:1.0.0-57
Requires: containers-common
Requires: containernetworking-plugins >= 0.7.5-1
Requires: iptables
Requires: nftables
# #1686813 - conmon hasn't been made independent yet
#Requires: conmon
Requires: conmon
Requires: %{name}-plugins = %{epoch}:%{version}-%{release}
Requires: container-selinux
%if 0%{?fedora}
Recommends: %{name}-manpages = %{epoch}:%{version}-%{release}
Recommends: container-selinux
BuildRequires: btrfs-progs-devel
BuildRequires: ostree-devel
Recommends: libvarlink-util
Recommends: slirp4netns >= 0.3.0-2
Recommends: fuse-overlayfs >= 0.3-8
Recommends: runc
Requires: crun >= 0.12.1-1
%else
#### DO NOT REMOVE - NEEDED FOR CENTOS
Requires: %{name}-manpages = %{version}-%{release}
Requires: container-selinux
Requires: slirp4netns >= 0.3.0-2
Requires: runc >= 1.0.0-57
Requires: runc
%endif
%if 0%{?centos} >= 8
Requires: libvarlink-util
%endif
# vendored libraries
@ -197,9 +214,12 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8
daemonless tool. %{name} provides a Docker-CLI comparable command line that
eases the transition from other container engines and allows the management of
pods, containers and images. Simply put: alias docker=%{name}.
Most %{name} commands can be run as a regular user, without requiring additional privileges.
Most %{name} commands can be run as a regular user, without requiring
additional privileges.
%{name} uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other.
%{name} uses Buildah(1) internally to create container images.
Both tools share image (not container) storage, hence each can use or
manipulate images (but not containers) created by the other.
%{summary}
%{repo} Simple management tool for pods, containers and images
@ -373,13 +393,13 @@ Requires: golang(github.com/urfave/cli)
%description unit-test-devel
%{summary}
libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes.
%{repo} provides a library for applications looking to use the
Container Pod concept popularized by Kubernetes.
This package contains unit tests for project
providing packages with %{import_path} prefix.
%endif
%if 0%{?fedora}
%package tests
Summary: Tests for %{name}
@ -392,9 +412,9 @@ Requires: jq
This package contains system tests for %{name}
%if 0%{?fedora} || 0%{?centos} >= 8
%package remote
Summary: (Experimental) Remote client for managing %{name} containers
Recommends: %{name}-manpages = %{epoch}:%{version}-%{release}
%description remote
Remote client for managing %{name} containers.
@ -407,58 +427,72 @@ manage pods, containers and container images. %{name}-remote supports ssh
connections as well.
%endif
%package manpages
Summary: Man pages for the %{name} commands
BuildArch: noarch
%package plugins
Summary: Plugins for %{name}
%files manpages
%{_mandir}/man1/%{name}*.1*
%description manpages
Man pages for the %{name} commands
%description plugins
This plugin sets up the use of dnsmasq on a given CNI network so
that Pods can resolve each other by name. When configured,
the pod and its IP address are added to a network specific hosts file
that dnsmasq will read in. Similarly, when a pod
is removed from the network, it will remove the entry from the hosts
file. Each CNI network will have its own dnsmasq instance.
%prep
%autosetup -Sgit -n %{repo}-%{commit0}
rm -rf docs/containers-mounts.conf.5.md
%autosetup -Sgit -n %{repo}-%{built_tag_strip}
# untar conmon
# untar dnsname
tar zxf %{SOURCE1}
sed -i 's/install.remote: podman-remote/install.remote:/' Makefile
sed -i 's/install.bin: podman/install.bin:/' Makefile
%build
export GO111MODULE=off
# build plugins first cause we don't wanna use podman's buildtags
pushd dnsname-%{commit_plugins}
mkdir _build
pushd _build
mkdir -p src/%{provider}.%{provider_tld}/%{project}
ln -s ../../../../ src/%{import_path_plugins}
popd
ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd)
%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname
popd
export GOPATH=$(pwd)/_build:$(pwd)
mkdir _build
pushd _build
mkdir -p src/%{provider}.%{provider_tld}/%{project}
ln -s ../../../../ src/%{import_path}
popd
ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd)
export GO111MODULE=off
%gogenerate ./cmd/%{name}/varlink/...
# build %%{name}
export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)"
%if 0%{?centos}
export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub"
%endif
%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
%if 0%{?fedora}
#### DO NOT REMOVE - NEEDED FOR CENTOS
%if 0%{?fedora} || 0%{?centos} >= 8
# build %%{name}-remote
export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)"
export BUILDTAGS+="remoteclient"
%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
%endif
# build conmon
pushd conmon-%{commit_conmon}
%{__make} all
popd
%install
%if 0%{?fedora}
sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i
%endif
sed -i 's/install.remote: podman-remote/install.remote:/' Makefile
sed -i 's/install.bin: podman/install.bin:/' Makefile
rm -rf docs/containers-mounts.conf.5.md
install -dp %{buildroot}%{_unitdir}
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
install.bin \
%if 0%{?fedora}
%if 0%{?fedora} || 0%{?centos} >= 8
install.remote \
%endif
install.man \
@ -473,11 +507,23 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md
install -dp %{buildroot}%{_datadir}/containers
install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers
# install conmon
pushd conmon-%{commit_conmon}
%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install.%{name}
# install plugins
pushd dnsname-%{commit_plugins}
%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
popd
# do not include docker and podman-remote man pages in main package
for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do
echo "$file*" >> podman.file-list
done
# do not install remote manpages on centos7
%if ! 0%{?fedora} && 0%{?centos} < 8
rm -rf %{buildroot}%{_mandir}/man1/docker-remote.1
rm -rf %{buildroot}%{_mandir}/man1/%{name}-remote.1
rm -rf %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5
%endif
# source codes for building projects
%if 0%{?with_devel}
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
@ -552,26 +598,26 @@ exit 0
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
%files
%files -f podman.file-list
%license LICENSE
%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
%{_bindir}/%{name}
%{_mandir}/man5/*.5*
%{_datadir}/bash-completion/completions/*
# By "owning" the site-functions dir, we don't need to Require zsh
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/_%{name}
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/conmon
%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
%{_datadir}/containers/%{repo}.conf
%{_unitdir}/io.%{name}.service
%{_unitdir}/io.%{name}.socket
%{_userunitdir}/io.%{name}.service
%{_userunitdir}/io.%{name}.socket
%{_usr}/lib/tmpfiles.d/%{name}.conf
%files docker
%{_bindir}/docker
%{_mandir}/man1/docker*.1*
%{_usr}/lib/tmpfiles.d/%{name}-docker.conf
%if 0%{?with_devel}
%files -n libpod-devel -f devel.file-list
@ -587,17 +633,208 @@ exit 0
%endif
#### DO NOT REMOVE - NEEDED FOR CENTOS
%if 0%{?fedora}
%if 0%{?fedora} || 0%{?centos} >= 8
%files remote
%license LICENSE
%{_bindir}/%{name}-remote
%{_mandir}/man1/%{name}-remote*.1*
%{_mandir}/man5/%{name}-remote*.5*
%endif
%files tests
%license LICENSE
%{_datadir}/%{name}/test
%endif
%dir %{_datadir}/%{name}/test
%dir %{_datadir}/%{name}/test/system
%{_datadir}/%{name}/test/system/*
%files plugins
%license dnsname-%{commit_plugins}/LICENSE
%doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md}
%{_libexecdir}/cni/dnsname
%changelog
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
- bump to v1.8.0
- autobuilt 2ced909
* Thu Feb 06 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.0-0.2
- bump crun dependency
* Mon Feb 03 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.0-0.1
- built v1.8.0-rc1
* Wed Jan 08 2020 Jindrich Novy <jnovy@redhat.com> - 2:1.7.1-3
- require container-selinux only when selinux-policy is installed and
move podman-remote man pages to dedicated package (#1765818)
* Tue Jan 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.7.0-2
- bump to v1.7.0
- autobuilt b7ce115
* Tue Jan 07 2020 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-0.5.rc2
- merge podman-manpages with podman package
- require container-selinux (#1765818)
- minor spec file updates
* Mon Jan 06 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.7.0-0.4.rc2
- use correct rc tag
* Thu Jan 02 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.7.0-0.3.rc1
- bump to v1.7.0-rc2
- autobuilt 9090c47
* Wed Dec 11 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.7.0-0.2.rc1
- bump to v1.7.0-rc1
- autobuilt 7bbef41
* Fri Nov 08 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.2-4
- add podman-plugins subpackage
* Wed Oct 30 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.6.2-3
- crun only for fedora ATM
* Thu Oct 17 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.2-2
- bump to v1.6.2
- autobuilt f3ffda1
* Wed Oct 16 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.2-0.2.rc1
- bump to v1.6.2-rc1
- autobuilt 4d653f0
* Wed Oct 09 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.1-5
- remove polkit dependency for now
* Wed Oct 09 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.1-4
- Requires: crun >= 0.10.2-1 and polkit
* Tue Oct 08 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.1-3
- add Recommends: runc for fedora
* Wed Oct 02 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.1-2
- bump to v1.6.1
- autobuilt 233d95f
* Wed Oct 02 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.1-0.2.rc1
- bump to v1.6.1-rc1
- autobuilt a2fdb6e
* Tue Oct 01 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.0-4
- Requires: crun >= 0.10-1
* Tue Oct 01 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.0-3
- bump release tag
* Tue Oct 01 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.0-2
- bump to v1.6.0
- autobuilt b02b072
* Wed Sep 25 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.0-0.2.rc2git9181c65
- bump to v1.6.0-rc2
- autobuilt 9181c65
* Tue Sep 17 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.6.0-2.gitca5ff03
- bump to v1.6.0-rc1
- autobuilt ca5ff03
* Sat Sep 14 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.5.1-3.git0005792
- use v1.5.1 tag
- use conmon package as runtime dep
* Fri Sep 13 2019 Daniel J Walsh <dwalsh@redhat.com> - 2:1.5.1-2.18
- Grab specific version of crun or newer.
* Tue Aug 27 2019 Daniel J Walsh <dwalsh@redhat.com> - 2:1.5.1-2.17
- Require crun rather then runc
- Switch to crun by default for cgroupsV2 support
* Thu Aug 22 2019 Daniel J Walsh <dwalsh@redhat.com> - 2:1.5.1-2.16.dev.gitce64c14
- Move man5 man pages into podman-manpage package
* Tue Aug 13 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2:1.5.1-1.16.dev.gitce64c14
- Add recommends libvarlink-util
* Tue Aug 13 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.5.1-0.16.dev.gitce64c14
- autobuilt ce64c14
* Tue Aug 13 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.5.1-0.15.dev.git7a859f0
- autobuilt 7a859f0
* Tue Aug 13 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.5.1-0.14.dev.git031437b
- autobuilt 031437b

View file

@ -1,2 +1,2 @@
SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78
SHA512 (libpod-031437b.tar.gz) = fa811585bb8fbd4d68a21399e3adf68c7c868f1e38545c033acdf448201e666cb95cd260fdaefcab088ad13513199a1d8267d7910dfc91f72dffea2418743ace
SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc
SHA512 (v1.8.0.tar.gz) = 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87

View file

@ -3,7 +3,15 @@
# Simple podman tests
#
# Log program versions
rpm -q podman podman-tests
# Log program and kernel versions
echo "Important package versions:"
(
uname -r
rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd' | sort
) | sed -e 's/^/ /'
# Log environment; or at least the useful bits
echo "Environment:"
env | grep -v LS_COLORS= | sort | sed -e 's/^/ /'
bats /usr/share/podman/test/system

View file

@ -18,5 +18,5 @@
# running the test with su doesn't create the directory for fedora user on /run/user/
# so create it manually
dir: ./
run: mkdir /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora
run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora
timeout: 15m