Skip to content

Commit a953b3a

Browse files
committed
chore: fix blobfuse build in pipeline
1 parent afdc007 commit a953b3a

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

.gitignore

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

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

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ e2e-teardown:
9292
helm delete blob-csi-driver --namespace kube-system
9393

9494
.PHONY: blob
95-
blob:
95+
blob: blobfuse-proxy
9696
CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -a -ldflags ${LDFLAGS} -mod vendor -o _output/blobplugin ./pkg/blobplugin
9797

9898
.PHONY: blob-windows
@@ -104,7 +104,7 @@ blob-darwin:
104104
CGO_ENABLED=0 GOOS=darwin go build -a -ldflags ${LDFLAGS} -mod vendor -o _output/blobplugin ./pkg/blobplugin
105105

106106
.PHONY: container
107-
container: blob blobfuse-proxy
107+
container: blob
108108
docker build -t $(IMAGE_TAG) --output=type=docker -f ./pkg/blobplugin/Dockerfile .
109109

110110
.PHONY: container-linux
@@ -113,7 +113,7 @@ container-linux:
113113
-t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) -f ./pkg/blobplugin/Dockerfile .
114114

115115
.PHONY: blob-container
116-
blob-container: blobfuse-proxy
116+
blob-container:
117117
docker buildx rm container-builder || true
118118
docker buildx create --use --name=container-builder
119119

@@ -170,7 +170,3 @@ blobfuse-proxy:
170170
mkdir -p ./pkg/blobfuse-proxy/debpackage/usr/bin/
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
172172
dpkg-deb --build pkg/blobfuse-proxy/debpackage deploy/blobfuse-proxy/blobfuse-proxy.deb
173-
174-
.PHONY: blobfuse-proxy-container
175-
blobfuse-proxy-container:
176-
sudo docker build -t blobfuse-proxy -f pkg/blobfuse-proxy/Dockerfile .

0 commit comments

Comments
 (0)