diff --git a/image-service-2.0.1-go-vendor.tar.gz b/image-service-2.0.1-go-vendor.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ac5084b953ca70e139564cc2cd83143d623df0c0 Binary files /dev/null and b/image-service-2.0.1-go-vendor.tar.gz differ diff --git a/nydus-rs.spec b/nydus-rs.spec index 4707b6a58f9d11d05c8b5fc3633efee6ae0d7217..8c52a1cbceb0add20300dcb5423fd465a20e3deb 100644 --- a/nydus-rs.spec +++ b/nydus-rs.spec @@ -3,23 +3,36 @@ Summary: Nydus image service Name: nydus-rs Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/dragonflyoss/image-service License: Apache-2.0 Source0: image-service-%{version}.tar.gz Source1: image-service-%{version}-vendor.tar.gz +Source2: image-service-%{version}-go-vendor.tar.gz BuildRequires: make BuildRequires: rust = 1.52.1 BuildRequires: cargo = 1.52.1 BuildRequires: rustfmt = 1.52.1 BuildRequires: clippy = 1.52.1 +BuildRequires: golang >= 1.16 %description Nydus - the Dragonfly image service, providing fast, secure and easy access to container images. %prep %autosetup -n image-service-%{version} +tar -xzf %{SOURCE2} +mkdir -p ./contrib/ctr-remote/vendor +mkdir -p ./contrib/docker-nydus-graphdriver/vendor +mkdir -p ./contrib/nydusify/vendor +mkdir -p ./contrib/nydus-overlayfs/vendor +tar -zxf ./image-service-2.0.1-go-vendor/ctr-remote-vendor.tar.gz -C ./contrib/ctr-remote +tar -zxf ./image-service-2.0.1-go-vendor/docker-nydus-graphdriver-vendor.tar.gz -C ./contrib/docker-nydus-graphdriver +tar -zxf ./image-service-2.0.1-go-vendor/nydusify-vendor.tar.gz -C ./contrib/nydusify +tar -zxf ./image-service-2.0.1-go-vendor/nydus-overlayfs-vendor.tar.gz -C ./contrib/nydus-overlayfs +go env -w GOFLAGS="-mod=vendor" + tar xof %{SOURCE1} mkdir -p .cargo cat >> .cargo/config << EOF @@ -51,6 +64,10 @@ directory = "./vendor" EOF %build +make -C contrib/nydusify +make -C contrib/ctr-remote +make -C contrib/nydus-overlayfs +make -C contrib/docker-nydus-graphdriver %make_build release %install @@ -58,6 +75,10 @@ install -p -D -m 0755 ./target-fusedev/release/nydusctl %{buildroot}%{_bindir}/n 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 ./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 +install -p -D -m 0755 ./contrib/nydus-overlayfs/bin/nydus-overlayfs %{buildroot}%{_bindir}/nydus-overlayfs install -p -D -m 0644 ./misc/configs/nydusd-config.json %{buildroot}%{_sysconfdir}/nydus/config.json %files @@ -65,6 +86,10 @@ install -p -D -m 0644 ./misc/configs/nydusd-config.json %{buildroot}%{_sysconfdi %{_bindir}/nydusd %{_bindir}/nydusd-virtiofs %{_bindir}/nydus-image +%{_bindir}/ctr-remote +%{_bindir}/nydus_graphdriver +%{_bindir}/nydusify +%{_bindir}/nydus-overlayfs %{_sysconfdir}/nydus/config.json %pre @@ -76,6 +101,9 @@ install -p -D -m 0644 ./misc/configs/nydusd-config.json %{buildroot}%{_sysconfdi %postun %changelog +* Mon Jul 25 2022 Qu Qinqi - 2.0.1-2 +- Add the binary of ctr-remote, nydus-graphdriver, nydusify and nydus-overlayfs. * Thu Jul 14 2022 Huang Jianan - 2.0.1-1 +- Update Nydus image service to 2.0.1 * Wed Mar 09 2022 Gao Xiang - 1.1.2-1 - Initial package.