Skip to content

Commit e2baca5

Browse files
authored
Merge pull request #524 from andyzhangx/blobfuse-proxy-package-image
feat: add blobfuse-proxy deb package in driver image
2 parents 0e58977 + 6cfaa01 commit e2baca5

File tree

3 files changed

+5
-35
lines changed

3 files changed

+5
-35
lines changed

deploy/blobfuse-proxy/blobfuse-proxy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
sleep 3s
6060
# tail blobfuse proxy logs
6161
journalctl -u blobfuse-proxy -f
62-
image: mcr.microsoft.com/oss/nginx/nginx:1.17.3-alpine
62+
image: mcr.microsoft.com/k8s/csi/blob-csi:latest
6363
imagePullPolicy: IfNotPresent
6464
name: sysctl-install-blobfuse-proxy
6565
env:

pkg/blobfuse-proxy/Dockerfile

Lines changed: 0 additions & 33 deletions
This file was deleted.

pkg/blobplugin/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ FROM k8s.gcr.io/build-image/debian-base:bullseye-v1.0.0
1616
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
19-
RUN wget -O /tmp/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && dpkg -i /tmp/packages-microsoft-prod.deb && apt-get update && apt install blobfuse fuse -y && rm -f /tmp/packages-microsoft-prod.deb
19+
RUN mkdir /blobfuse-proxy/
20+
COPY deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb /blobfuse-proxy/
21+
RUN wget -O /blobfuse-proxy/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
22+
RUN dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse fuse -y
2023
# this is a workaround to install nfs-kernel-server and don't quit with error
2124
RUN apt install nfs-kernel-server -y || true
2225
RUN apt remove wget -y

0 commit comments

Comments
 (0)