diff --git a/image-service-2.1.0-rc.2-go-vendor.tar.gz b/image-service-2.1.1-go-vendor.tar.gz similarity index 54% rename from image-service-2.1.0-rc.2-go-vendor.tar.gz rename to image-service-2.1.1-go-vendor.tar.gz index b6d32f1ba0031f26f89b79040460ac98f8aef314..bbcb70c551b6e7f912aa0ff2695a05339a7fcb85 100644 Binary files a/image-service-2.1.0-rc.2-go-vendor.tar.gz and b/image-service-2.1.1-go-vendor.tar.gz differ diff --git a/image-service-2.1.0-rc.2-vendor.tar.gz b/image-service-2.1.1-vendor.tar.gz similarity index 71% rename from image-service-2.1.0-rc.2-vendor.tar.gz rename to image-service-2.1.1-vendor.tar.gz index 9147ade830da9366ffbf747b2c548b58238c9e28..a615124b64595dce48d5146c8fcb1543bf267560 100644 Binary files a/image-service-2.1.0-rc.2-vendor.tar.gz and b/image-service-2.1.1-vendor.tar.gz differ diff --git a/image-service-2.1.0-rc.2.tar.gz b/image-service-2.1.1.tar.gz similarity index 35% rename from image-service-2.1.0-rc.2.tar.gz rename to image-service-2.1.1.tar.gz index 0246a3a5b96863db797f2329f596df4dfd5a601e..0c8e99bf0c5e73573d7cada2b7880e977d8e36a1 100644 Binary files a/image-service-2.1.0-rc.2.tar.gz and b/image-service-2.1.1.tar.gz differ diff --git a/nydus-rs.spec b/nydus-rs.spec index c1622bbb1dcd6b6ea24b8b517c3d1cb76196767c..eee11c512343797cc667bff39cc9820fdd173704 100644 --- a/nydus-rs.spec +++ b/nydus-rs.spec @@ -1,13 +1,12 @@ -%define release_version 2.1.0 -%define pre_version rc.2 +%define release_version 2.1.1 %define anolis_release 1 -%define pkg_name image-service-%{release_version}-%{pre_version} +%define pkg_name image-service-%{release_version} %global __os_install_post %{nil} %global debug_package %{nil} Summary: Nydus image service Name: nydus-rs -Version: %{release_version}~%{pre_version} +Version: %{release_version} Release: %{anolis_release}%{?dist} URL: https://github.com/dragonflyoss/image-service License: Apache-2.0 @@ -20,13 +19,13 @@ BuildRequires: rust = 1.61.0 BuildRequires: cargo = 1.61.0 BuildRequires: rustfmt = 1.61.0 BuildRequires: clippy = 1.61.0 -BuildRequires: golang >= 1.16 +BuildRequires: golang >= 1.17 %description Nydus - the Dragonfly image service, providing fast, secure and easy access to container images. %prep -%autosetup -n image-service-%{release_version}-%{pre_version} +%autosetup -n image-service-%{release_version} tar -xzf %{SOURCE2} mkdir -p ./contrib/ctr-remote/vendor mkdir -p ./contrib/docker-nydus-graphdriver/vendor @@ -58,10 +57,9 @@ make -C contrib/docker-nydus-graphdriver %make_build release %install -install -p -D -m 0755 ./target-fusedev/release/nydusctl %{buildroot}%{_bindir}/nydusctl -install -p -D -m 0755 ./target-fusedev/release/nydusd %{buildroot}%{_bindir}/nydusd -install -p -D -m 0755 ./target-fusedev/release/nydus-image %{buildroot}%{_bindir}/nydus-image -install -p -D -m 0755 ./target-virtiofs/release/nydusd %{buildroot}%{_bindir}/nydusd-virtiofs +install -p -D -m 0755 ./target/release/nydusctl %{buildroot}%{_bindir}/nydusctl +install -p -D -m 0755 ./target/release/nydusd %{buildroot}%{_bindir}/nydusd +install -p -D -m 0755 ./target/release/nydus-image %{buildroot}%{_bindir}/nydus-image install -p -D -m 0755 ./contrib/ctr-remote/bin/ctr-remote %{buildroot}%{_bindir}/ctr-remote install -p -D -m 0755 ./contrib/docker-nydus-graphdriver/bin/nydus_graphdriver %{buildroot}%{_bindir}/nydus_graphdriver install -p -D -m 0755 ./contrib/nydusify/cmd/nydusify %{buildroot}%{_bindir}/nydusify @@ -73,7 +71,6 @@ mkdir -p %{buildroot}/var/cache/nydus-rs/ %files %{_bindir}/nydusctl %{_bindir}/nydusd -%{_bindir}/nydusd-virtiofs %{_bindir}/nydus-image %{_bindir}/ctr-remote %{_bindir}/nydus_graphdriver @@ -91,6 +88,8 @@ mkdir -p %{buildroot}/var/cache/nydus-rs/ %postun %changelog +* Mon Dec 26 2022 Qinqi Qu - 2.1.1-1 +- Update Nydus image service to 2.1.1 * Thu Sep 8 2022 Qinqi Qu - 2.1.0-rc.2-1 - Update Nydus image service to 2.1.0-rc.2 * Wed Aug 10 2022 Huang Jianan - 2.1.0~rc.1-1