diff --git a/.gitignore b/.gitignore index 4702259..de53295 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/cri-o-a30f93c.tar.gz -SOURCES/libpod-db08685.tar.gz +SOURCES/cri-o-464dba6.tar.gz +SOURCES/libpod-594495d.tar.gz diff --git a/.podman.metadata b/.podman.metadata index eecc9d1..92192e7 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,2 +1,2 @@ -53e0c0d4e10030c0df6bc1be9065df02c0cf991d SOURCES/cri-o-a30f93c.tar.gz -f22f77d1eab76e24e144a2ee85f516ca0f50ab7c SOURCES/libpod-db08685.tar.gz +df547f025f22dd497230d39527e7d584b53b7f6f SOURCES/cri-o-464dba6.tar.gz +1eba58550111febad9c0f85e5028802fe56f0065 SOURCES/libpod-594495d.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 2614362..274c1c8 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -5,10 +5,10 @@ %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 %else -%global debug_package %{nil} +%global debug_package %{nil} %endif -%define gobuild(o:) go build -tags="$BUILDTAGS selinux seccomp" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; +%define gobuild(o:) 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 %{?**}; %global provider github %global provider_tld com @@ -18,17 +18,17 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit db08685af57206c21fd3dd150ecb70d7147ce7f4 +%global commit 594495db2637a6e485fffd8aa57c193244e16578 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o %global git_conmon https://%{import_path_conmon} -%global commit_conmon a30f93ca229c7fc68fb1d8c7a3342de3c3f54ae5 +%global commit_conmon 464dba6f310e2efd43d75ceef1acb9642cf9c77d %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.10.1.3 -Release: 1.git%{shortcommit}%{?dist} +Version: 0.11.1.1 +Release: 3.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -39,7 +39,7 @@ Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar. #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %else BuildRequires: go-toolset-7-runtime @@ -175,12 +175,26 @@ Provides: bundled(golang(gopkg.in/yaml.v2)) = v2 libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. +%package docker +Summary: Emulate Docker CLI using podman +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Conflicts: docker +Conflicts: docker-latest +Conflicts: docker-ce +Conflicts: docker-ee +Conflicts: docker-common + +%description docker +This package installs a script named docker that emulates the Docker CLI by +executing %{name} commands, it also creates links between all Docker CLI man +pages and %{name}. + # Go Toolset %{?enable_gotoolset7} %prep %autosetup -Sgit -n %{repo}-%{commit} -sed -i '/\/bin\/env/d' completions/bash/%{name} mv pkg/hooks/README.md pkg/hooks/README-hooks.md # untar cri-o @@ -193,13 +207,12 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -export GOPATH=$(pwd)/_build:$(pwd) -export BUILDTAGS="selinux seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" -GOPATH=$GOPATH go generate ./cmd/%{name}/varlink/... -GOPATH=$GOPATH BUILDTAGS="$BUILDTAGS" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -#GOPATH=%{_prefix} make docs -make GOPATH=%{buildroot} docs +export GOPATH=$(pwd):$(pwd)/_build +export BUILDTAGS="selinux seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" +go generate $(pwd)/cmd/%{name}/varlink/... +%gobuild -o bin/%{name} %{import_path}/cmd/%{name} +make docs # build conmon pushd cri-o-%{commit_conmon} @@ -212,14 +225,18 @@ popd ln -s vendor src export GOPATH=$(pwd)/_output:$(pwd) export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" -make BUILDTAGS="$BUILDTAGS" GOPATH=$GOPATH bin/conmon +%gobuild -o bin/crio-config %{import_path_conmon}/cmd/crio-config +cd conmon && ../bin/crio-config +%{__make} all popd %install -%{__make} PREFIX=%{buildroot}%{_usr} ETCDIR=%{buildroot}%{_sysconfdir} \ +%{__make} GOPATH=%{buildroot} PREFIX=%{buildroot}%{_usr} ETCDIR=%{buildroot}%{_sysconfdir} \ + SYSTEMDDIR=%{buildroot}%{_unitdir} MANDIR=%{buildroot}%{_mandir} \ install.bin \ install.man \ install.cni \ + install.docker \ install.systemd \ install.completions @@ -231,6 +248,8 @@ install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers install -dp %{buildroot}%{_libexecdir}/%{name} install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} +rm -rf %{buildroot}/src/github.com/containers/* + %check %if 0%{?with_check} ln -s ./ ./vendor/src # ./vendor/src -> ./vendor @@ -253,7 +272,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} -%{_mandir}/man1/*.1* +%{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* %{_libexecdir}/%{name}/conmon @@ -263,7 +282,41 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_unitdir}/io.%{name}.service %{_unitdir}/io.%{name}.socket +%files docker +%{_bindir}/docker +%{_mandir}/man1/docker*.1* + %changelog +* Thu Nov 15 2018 Lokesh Mandvekar - 0.11.1.1-3.git594495d +- correctly generate debuginfo by updating gobuild def + +* Thu Nov 15 2018 Lokesh Mandvekar - 0.11.1.1-2.git594495d +- enable debuginfo for conmon + +* Thu Nov 15 2018 Lokesh Mandvekar - 0.11.1.1-1.git594495d +- Resolves: #1649563, #1648429 +- bump to v0.11.1.1 +- built libpod commit 594495d + +* Wed Nov 14 2018 Frantisek Kluknavsky - 0.11.1-2.gita4adfe5 +- fix conflicts with docker and docker-common + +* Tue Nov 13 2018 Lokesh Mandvekar - 0.11.1-1.gita4adfe5 +- bump to v0.11.1 +- subpackage podman-docker +- built libpod commit a4adfe5 +- built conmon from cri-o commit 464dba6 + +* Fri Nov 02 2018 Frantisek Kluknavsky - 0.10.1.3-4.gitee513cc +- rpm macro for centos + +* Wed Oct 31 2018 Frantisek Kluknavsky - 0.10.1.3-3.gitee513cc +- rebase + +* Fri Oct 26 2018 Frantisek Kluknavsky - 0.10.1.3-2.git6e1aeb0 +- rebase to 6e1aeb06f86bfed7045be19c8e8b09c1bf5ba55f +- rebase cri-o to 1.12 + * Thu Oct 18 2018 Lokesh Mandvekar - 0.10.1.3-1.gitdb08685 - Resolves: #1640342 - update vendored buildah to allow building when there are containers running