Skip to content

Commit 191f7b3

Browse files
committed
chore: refactor Dockerfile
1 parent cdec3d2 commit 191f7b3

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/blobplugin/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@ ARG ARCH=amd64
1818
COPY ./_output/${ARCH}/blobplugin /blobplugin
1919

2020
RUN apt update && apt-mark unhold libcap2
21-
RUN clean-install ca-certificates libfuse-dev libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev util-linux mount udev wget e2fsprogs nfs-common netbase
21+
RUN clean-install ca-certificates uuid-dev util-linux mount udev wget e2fsprogs nfs-common netbase
2222
# install updated packages to fix CVE issues
2323
RUN clean-install libssl1.1 libgssapi-krb5-2 libk5crypto3 libkrb5-3 libkrb5support0 libgmp10
2424
RUN mkdir /blobfuse-proxy/
2525
COPY ./_output/blobfuse-proxy.deb /blobfuse-proxy/
2626
# for compatibility, remove this after v1.6.0 release (todo)
2727
COPY deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb /blobfuse-proxy/
28-
RUN wget -O /blobfuse-proxy/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
2928
ARG ARCH=amd64
30-
RUN if [ "$ARCH" = "amd64" ] ; then dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse fuse -y; fi
31-
RUN apt remove wget -y
29+
RUN if [ "$ARCH" = "amd64" ] ; then \
30+
clean-install libfuse-dev libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev && \
31+
wget -O /blobfuse-proxy/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && \
32+
dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse fuse -y && apt remove wget -y; fi
3233
LABEL maintainers="andyzhangx"
3334
LABEL description="Azure Blob Storage CSI driver"
3435

0 commit comments

Comments
 (0)