packages/docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!30 docker: remove go-md2man build require

Browse Source 
From: @DCCooper
Reviewed-by: @jingxiaolu,@caihaomin
Signed-off-by: @caihaomin
This commit is contained in:
openeuler-ci-bot 2021-02-09 19:05:15 +08:00 committed by Gitee
commit 773302aeb3
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION-openeuler
View File

@ -1 +1 @@
18.09.0.112 18.09.0.113

31
docker.spec
View File

@ -1,6 +1,6 @@
Name: docker-engine Name: docker-engine
Version: 18.09.0 Version: 18.09.0
Release: 112 Release: 113
Summary: The open-source application container engine Summary: The open-source application container engine
Group: Tools/Docker Group: Tools/Docker
@ -20,7 +20,7 @@ URL: https://mobyproject.org
# required packages for build # required packages for build
# most are already in the container (see contrib/builder/rpm/ARCH/generate.sh) # most are already in the container (see contrib/builder/rpm/ARCH/generate.sh)
BuildRequires: pkgconfig(systemd) golang >= 1.8.3 go-md2man btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel BuildRequires: pkgconfig(systemd) golang >= 1.8.3 btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel
BuildRequires: libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel BuildRequires: libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel
BuildRequires: tar containerd docker-runc docker-proxy BuildRequires: tar containerd docker-runc docker-proxy
@ -73,8 +73,9 @@ ln -sf ${WORKDIR}/components/engine .gopath/src/github.com/docker/docker
cd .gopath/src/github.com/docker/cli cd .gopath/src/github.com/docker/cli
make dynbinary make dynbinary
# man is provided in docker --help and dockerd --help
# ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here # ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here
./man/md2man-all.sh -q # ./man/md2man-all.sh -q
rm -rf .gopath rm -rf .gopath
cd ${WORKDIR} cd ${WORKDIR}
@ -123,12 +124,12 @@ install -p -m 644 components/cli/contrib/completion/zsh/_docker $RPM_BUILD_ROOT/
install -p -m 644 components/cli/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish install -p -m 644 components/cli/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish
# install manpages # install manpages
install -d %{buildroot}%{_mandir}/man1 # install -d %{buildroot}%{_mandir}/man1
install -p -m 644 components/cli/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1 # install -p -m 644 components/cli/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1
install -d %{buildroot}%{_mandir}/man5 # install -d %{buildroot}%{_mandir}/man5
install -p -m 644 components/cli/man/man5/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5 # install -p -m 644 components/cli/man/man5/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5
install -d %{buildroot}%{_mandir}/man8 # install -d %{buildroot}%{_mandir}/man8
install -p -m 644 components/cli/man/man8/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8 # install -p -m 644 components/cli/man/man8/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8
# add vimfiles # add vimfiles
install -d $RPM_BUILD_ROOT/usr/share/vim/vimfiles/doc install -d $RPM_BUILD_ROOT/usr/share/vim/vimfiles/doc
@ -161,9 +162,9 @@ install -p -m 644 components/engine/contrib/syntax/nano/Dockerfile.nanorc $RPM_B
/usr/share/zsh/vendor-completions/_docker /usr/share/zsh/vendor-completions/_docker
/usr/share/fish/vendor_completions.d/docker.fish /usr/share/fish/vendor_completions.d/docker.fish
%doc %doc
/%{_mandir}/man1/* #/%{_mandir}/man1/*
/%{_mandir}/man5/* #/%{_mandir}/man5/*
/%{_mandir}/man8/* #/%{_mandir}/man8/*
%config(noreplace,missingok) /etc/sysconfig/docker %config(noreplace,missingok) /etc/sysconfig/docker
%config(noreplace,missingok) /etc/sysconfig/docker-storage %config(noreplace,missingok) /etc/sysconfig/docker-storage
@ -210,6 +211,12 @@ fi
%endif %endif
%changelog %changelog
* Tue Feb 09 2021 lixiang<lixiang172@huawei.com> - 18.09.0-113
- Type:enhancement
- CVE:NA
- SUG:restart
- DESC:remove go-md2man build require
* Mon Jan 4 2021 yangyanchao<yangyanchao6@huawei.com> - 18.09.0-111 * Mon Jan 4 2021 yangyanchao<yangyanchao6@huawei.com> - 18.09.0-111
- Type:requirement - Type:requirement
- ID:NA - ID:NA

2
gen-commit.sh
View File

@ -18,7 +18,7 @@ echo 18.09.0.$new_version > VERSION-openeuler
author=$(git config user.name) author=$(git config user.name)
email=$(git config user.email) email=$(git config user.email)
version=$(head -1 docker.spec | awk '{print $NF}') version=$(head -10 docker.spec | grep Version | awk '{print $NF}')
release=$(head -10 docker.spec | grep Release | awk '{print $2}' | awk -F% '{print $1}') release=$(head -10 docker.spec | grep Release | awk '{print $2}' | awk -F% '{print $1}')
new_all=$version-$release new_all=$version-$release
new_changelog=$(cat << EOF new_changelog=$(cat << EOF

2
git-commit
View File

@ -1 +1 @@
I4dc92059d90415199fcd143d75cc68cfdb67c430 e9d595711a6ccf4cc603740dddbb3655c6b7d922