From 83911be98670c79b865687c8ad8fdbf54f25e3f0 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sat, 16 Oct 2021 02:02:22 +0000 Subject: [PATCH] cleanup: move blobfuse-proxy.deb to _output dir fix failure --- .github/workflows/linux.yaml | 2 +- .gitignore | 1 - Makefile | 4 ++-- pkg/blobplugin/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 6b5bd0be6..f54ca3c3d 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -41,7 +41,7 @@ jobs: run: | export PATH=$PATH:$HOME/.local/bin make blobfuse-proxy - sudo dpkg -i deploy/blobfuse-proxy/blobfuse-proxy.deb + sudo dpkg -i _output/blobfuse-proxy.deb - name: Get code coverage env: diff --git a/.gitignore b/.gitignore index c18535a39..303cb669d 100644 --- a/.gitignore +++ b/.gitignore @@ -71,4 +71,3 @@ cscope.* profile.cov pkg/blobfuse-proxy/debpackage/usr/ -deploy/blobfuse-proxy/blobfuse-proxy.deb diff --git a/Makefile b/Makefile index af4702491..660f0ac85 100644 --- a/Makefile +++ b/Makefile @@ -167,6 +167,6 @@ delete-metrics-svc: .PHONY: blobfuse-proxy blobfuse-proxy: - mkdir -p ./pkg/blobfuse-proxy/debpackage/usr/bin/ + mkdir -p ./pkg/blobfuse-proxy/debpackage/usr/bin/ ./_output CGO_ENABLED=0 GOOS=linux go build -mod vendor -ldflags="-s -w" -o ./pkg/blobfuse-proxy/debpackage/usr/bin/blobfuse-proxy ./pkg/blobfuse-proxy - dpkg-deb --build pkg/blobfuse-proxy/debpackage deploy/blobfuse-proxy/blobfuse-proxy.deb + dpkg-deb --build pkg/blobfuse-proxy/debpackage ./_output/blobfuse-proxy.deb diff --git a/pkg/blobplugin/Dockerfile b/pkg/blobplugin/Dockerfile index 44c2b1bf3..0e57308bd 100644 --- a/pkg/blobplugin/Dockerfile +++ b/pkg/blobplugin/Dockerfile @@ -17,9 +17,9 @@ COPY ./_output/blobplugin /blobplugin RUN apt update && apt-mark unhold libcap2 RUN clean-install ca-certificates libfuse-dev libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev util-linux mount udev wget e2fsprogs nfs-common libssl1.1 RUN mkdir /blobfuse-proxy/ +COPY ./_output/blobfuse-proxy.deb /blobfuse-proxy/ # for compatibility, remove this after v1.6.0 release (todo) COPY deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb /blobfuse-proxy/ -COPY deploy/blobfuse-proxy/blobfuse-proxy.deb /blobfuse-proxy/ RUN wget -O /blobfuse-proxy/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb RUN dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse fuse -y # this is a workaround to install nfs-kernel-server and don't quit with error