Merge pull request #8553 from rook/mergify/bp/release-1.7/pr-8534

nfs: upgrade nfs-ganesha to 3.5 version (backport #8534)
rook · Aug 17, 2021 · 8f9cc97 · 8f9cc97
2 parents b3d0e4e + ce2ea64
commit 8f9cc97
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/images/nfs/Dockerfile b/images/nfs/Dockerfile
@@ -22,10 +22,11 @@ FROM NFS_BASEIMAGE
 # 3. Use device major/minor as fsid major/minor to work on OverlayFS
 
 RUN DEBIAN_FRONTEND=noninteractive \
- && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FE869A9 \
- && echo "deb http://ppa.launchpad.net/gluster/nfs-ganesha-2.7/ubuntu xenial main" > /etc/apt/sources.list.d/nfs-ganesha-2.5.list \
- && echo "deb http://ppa.launchpad.net/gluster/libntirpc-1.7/ubuntu xenial main" > /etc/apt/sources.list.d/libntirpc-1.5.list \
- && echo "deb http://ppa.launchpad.net/gluster/glusterfs-5/ubuntu xenial main" > /etc/apt/sources.list.d/glusterfs-3.13.list \
+ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 10353E8834DC57CA \
+ && echo "deb http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-3.0/ubuntu xenial main" > /etc/apt/sources.list.d/nfs-ganesha.list \
+ && echo "deb http://ppa.launchpad.net/nfs-ganesha/libntirpc-3.0/ubuntu xenial main" > /etc/apt/sources.list.d/libntirpc.list \
+ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 13e01b7b3fe869a9 \
+ && echo "deb http://ppa.launchpad.net/gluster/glusterfs-6/ubuntu xenial main" > /etc/apt/sources.list.d/glusterfs.list \
  && apt-get update \
  && apt-get install -y netbase nfs-common dbus nfs-ganesha nfs-ganesha-vfs glusterfs-common xfsprogs \
  && apt-get clean \