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

!159 [sync] PR-155: docker: using VERSION-vendor to record version

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2022-11-24 07:34:32 +00:00 committed by Gitee
commit f5a6e93a36
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION-openeuler
View File

@ -1 +0,0 @@
18.09.0.246

1
VERSION-vendor Normal file
View File

@ -0,0 +1 @@
18.09.0.247

4
apply-patches
View File

@ -36,8 +36,8 @@ if [ "$1" == "selinux" ]; then
cp -rf $src/components/engine/contrib/selinux-euleros/docker-engine-selinux/* . cp -rf $src/components/engine/contrib/selinux-euleros/docker-engine-selinux/* .
else else
cp -rf $src/* . cp -rf $src/* .
cp -rf VERSION-openeuler $cwd/components/cli/ cp -rf VERSION-vendor $cwd/components/cli/
cp -rf VERSION-openeuler $cwd/components/engine/ cp -rf VERSION-vendor $cwd/components/engine/
fi fi
mv $src/.git $src/git mv $src/.git $src/git

8
docker-engine-openeuler.spec
View File

@ -1,6 +1,6 @@
Name: docker-engine Name: docker-engine
Version: 18.09.0 Version: 18.09.0
Release: 246 Release: 247
Epoch: 1 Epoch: 1
Summary: The open-source application container engine Summary: The open-source application container engine
Group: Tools/Docker Group: Tools/Docker
@ -199,6 +199,12 @@ fi
%endif %endif
%changelog %changelog
* Thu Nov 24 2022 chenjiankun<chenjiankun1@huawei.com> - 18.09.0-247
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:using VERSION-vendor to record version
* Tue Nov 22 2022 chenjiankun<chenjiankun1@huawei.com> - 18.09.0-246 * Tue Nov 22 2022 chenjiankun<chenjiankun1@huawei.com> - 18.09.0-246
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA

4
patch/0141-docker-remove-logo-info.patch
View File

@ -21,7 +21,7 @@ index d504032..86d0e3a 100755
PLATFORM=${PLATFORM:-} PLATFORM=${PLATFORM:-}
VERSION=${VERSION:-"unknown-version"} VERSION=${VERSION:-"unknown-version"}
-EULERVERSION=${EULERVERSION:-$(cat VERSION-EULER)} -EULERVERSION=${EULERVERSION:-$(cat VERSION-EULER)}
+EULERVERSION=${EULERVERSION:-$(cat VERSION-openeuler)} +EULERVERSION=${EULERVERSION:-$(cat VERSION-vendor)}
GITCOMMIT=${GITCOMMIT:-$(git rev-parse --short HEAD 2> /dev/null || true)} GITCOMMIT=${GITCOMMIT:-$(git rev-parse --short HEAD 2> /dev/null || true)}
BUILDTIME=${BUILDTIME:-$(date --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')} BUILDTIME=${BUILDTIME:-$(date --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')}
@ -34,7 +34,7 @@ index fa87d91..686e688 100755
) )
-VERSION_EULER=$(< ./VERSION-EULER) -VERSION_EULER=$(< ./VERSION-EULER)
+VERSION_EULER=$(< ./VERSION-openeuler) +VERSION_EULER=$(< ./VERSION-vendor)
VERSION=${VERSION:-dev} VERSION=${VERSION:-dev}
! BUILDTIME=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') ! BUILDTIME=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
if [ "$DOCKER_GITCOMMIT" ]; then if [ "$DOCKER_GITCOMMIT" ]; then