diff --git a/VERSION-openeuler b/VERSION-openeuler deleted file mode 100644 index 71f1af82f16dc96697e26d38820b6420e629fb6b..0000000000000000000000000000000000000000 --- a/VERSION-openeuler +++ /dev/null @@ -1 +0,0 @@ -18.09.0.246 diff --git a/VERSION-vendor b/VERSION-vendor new file mode 100644 index 0000000000000000000000000000000000000000..13757c826b031cda08b084fd28a80f4030f155e6 --- /dev/null +++ b/VERSION-vendor @@ -0,0 +1 @@ +18.09.0.247 diff --git a/apply-patches b/apply-patches index d398bf26c084da01470d1a9fd791391ba74b8e81..bf6b932022678a7dab6d2fcfe5e61298e94e48f7 100755 --- a/apply-patches +++ b/apply-patches @@ -36,8 +36,8 @@ if [ "$1" == "selinux" ]; then cp -rf $src/components/engine/contrib/selinux-euleros/docker-engine-selinux/* . else cp -rf $src/* . - cp -rf VERSION-openeuler $cwd/components/cli/ - cp -rf VERSION-openeuler $cwd/components/engine/ + cp -rf VERSION-vendor $cwd/components/cli/ + cp -rf VERSION-vendor $cwd/components/engine/ fi mv $src/.git $src/git diff --git a/docker-engine-openeuler.spec b/docker-engine-openeuler.spec index 53cf90ca39530112ea900ed40b1a575c0034a2d3..c7ca7e35c07b5b0d270fce817e05efa50e9ab4c8 100644 --- a/docker-engine-openeuler.spec +++ b/docker-engine-openeuler.spec @@ -1,6 +1,6 @@ Name: docker-engine Version: 18.09.0 -Release: 246 +Release: 247 Epoch: 1 Summary: The open-source application container engine Group: Tools/Docker @@ -199,6 +199,12 @@ fi %endif %changelog +* Thu Nov 24 2022 chenjiankun - 18.09.0-247 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:using VERSION-vendor to record version + * Tue Nov 22 2022 chenjiankun - 18.09.0-246 - Type:bugfix - CVE:NA diff --git a/patch/0141-docker-remove-logo-info.patch b/patch/0141-docker-remove-logo-info.patch index aad52bf0ea2ccf1a6e9e928699fde2ad5c9cc7f0..51ccccb4770f499052f275cadd0f60895ce76948 100644 --- a/patch/0141-docker-remove-logo-info.patch +++ b/patch/0141-docker-remove-logo-info.patch @@ -21,7 +21,7 @@ index d504032..86d0e3a 100755 PLATFORM=${PLATFORM:-} VERSION=${VERSION:-"unknown-version"} -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)} 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-openeuler) ++VERSION_EULER=$(< ./VERSION-vendor) VERSION=${VERSION:-dev} ! BUILDTIME=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') if [ "$DOCKER_GITCOMMIT" ]; then