Skip to content

Commit f5f4d59

Browse files
authored
Merge pull request #550 from andyzhangx/proxy-deb-cleanup
cleanup: move blobfuse-proxy.deb to _output dir
2 parents c7e430e + 83911be commit f5f4d59

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.github/workflows/linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
export PATH=$PATH:$HOME/.local/bin
4343
make blobfuse-proxy
44-
sudo dpkg -i deploy/blobfuse-proxy/blobfuse-proxy.deb
44+
sudo dpkg -i _output/blobfuse-proxy.deb
4545
4646
- name: Get code coverage
4747
env:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,3 @@ cscope.*
7171
profile.cov
7272

7373
pkg/blobfuse-proxy/debpackage/usr/
74-
deploy/blobfuse-proxy/blobfuse-proxy.deb

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,6 @@ delete-metrics-svc:
167167

168168
.PHONY: blobfuse-proxy
169169
blobfuse-proxy:
170-
mkdir -p ./pkg/blobfuse-proxy/debpackage/usr/bin/
170+
mkdir -p ./pkg/blobfuse-proxy/debpackage/usr/bin/ ./_output
171171
CGO_ENABLED=0 GOOS=linux go build -mod vendor -ldflags="-s -w" -o ./pkg/blobfuse-proxy/debpackage/usr/bin/blobfuse-proxy ./pkg/blobfuse-proxy
172-
dpkg-deb --build pkg/blobfuse-proxy/debpackage deploy/blobfuse-proxy/blobfuse-proxy.deb
172+
dpkg-deb --build pkg/blobfuse-proxy/debpackage ./_output/blobfuse-proxy.deb

pkg/blobplugin/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ COPY ./_output/blobplugin /blobplugin
1717
RUN apt update && apt-mark unhold libcap2
1818
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
1919
RUN mkdir /blobfuse-proxy/
20+
COPY ./_output/blobfuse-proxy.deb /blobfuse-proxy/
2021
# for compatibility, remove this after v1.6.0 release (todo)
2122
COPY deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb /blobfuse-proxy/
22-
COPY deploy/blobfuse-proxy/blobfuse-proxy.deb /blobfuse-proxy/
2323
RUN wget -O /blobfuse-proxy/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
2424
RUN dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse fuse -y
2525
# this is a workaround to install nfs-kernel-server and don't quit with error

0 commit comments

Comments
 (0)