Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup: move blobfuse-proxy.deb to _output dir #550

Merged
merged 1 commit into from
Oct 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,3 @@ cscope.*
profile.cov

pkg/blobfuse-proxy/debpackage/usr/
deploy/blobfuse-proxy/blobfuse-proxy.deb
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pkg/blobplugin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down