fix init.sh

Author: cvvz

pkg/blobfuse-proxy/init.sh

@@ -29,17 +29,24 @@ echo "Linux distribution: $DISTRIBUTION"
 
 if [ "${DISTRIBUTION}" = "ubuntu" ] && ([ "${INSTALL_BLOBFUSE}" = "true" ] || [ "${INSTALL_BLOBFUSE2}" = "true" ])
 then
-  cp /blobfuse-proxy/packages-microsoft-prod.deb /host/etc/
+  release=$($HOST_CMD lsb_release -rs)
+  echo "Ubuntu release: $release"
+  
+  if [ "$release" = "22.04" ]
+  then
+    cp /blobfuse-proxy/packages-microsoft-prod-22.04.deb /host/etc/packages-microsoft-prod.deb
+  else
+    cp /blobfuse-proxy/packages-microsoft-prod-18.04.deb /host/etc/packages-microsoft-prod.deb
+  fi
+  
   # when running dpkg -i /etc/packages-microsoft-prod.deb, need to enter y to continue. 
   # refer to https://stackoverflow.com/questions/45349571/how-to-install-deb-with-dpkg-non-interactively
   yes | $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && $HOST_CMD apt update
 
   pkg_list=""
-  if [ "${INSTALL_BLOBFUSE}" = "true" ]
+  if [ "${INSTALL_BLOBFUSE}" = "true" ] && [ "$release" = "18.04" ]
   then
-    if [ "$release" = "18.04" ]; then
-      pkg_list="${pkg_list} fuse"
-    fi
+    pkg_list="${pkg_list} fuse"
     # install blobfuse with latest version or specific version
     if [ -z "${BLOBFUSE_VERSION}" ]; then
       echo "install blobfuse with latest version"
@@ -51,7 +58,6 @@ then
 
   if [ "${INSTALL_BLOBFUSE2}" = "true" ]
   then
-    release=$($HOST_CMD lsb_release -rs)
     if [ "$release" = "18.04" ]; then
       echo "install fuse for blobfuse2"
       pkg_list="${pkg_list} fuse"

pkg/blobplugin/Dockerfile

@@ -33,8 +33,9 @@ RUN apt update && apt upgrade -y && apt-mark unhold libcap2 && clean-install ca-
 ARG ARCH=amd64
 RUN if [ "$ARCH" = "amd64" ] ; then \
   clean-install libcurl4-gnutls-dev && \
-  wget -O /blobfuse-proxy/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && \
-  dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse blobfuse2 fuse -y && apt remove wget -y; fi
+  wget -O /blobfuse-proxy/packages-microsoft-prod-22.04.deb https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb && \
+  wget -O /blobfuse-proxy/packages-microsoft-prod-18.04.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && \
+  dpkg -i /blobfuse-proxy/packages-microsoft-prod-18.04.deb && apt update && apt install blobfuse blobfuse2 fuse -y && apt remove wget -y; fi
 LABEL maintainers="andyzhangx"
 LABEL description="Azure Blob Storage CSI driver"