Merge pull request #89 from yselkowitz/enable-ibm-p-z

Use nfs-ganesha as base for container image

Author: k8s-ci-robot

deploy/docker/Dockerfile

@@ -12,96 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Modified from https://github.com/rootfs/nfs-ganesha-docker by Huamin Chen
-#
-# NOTE: This Dockerfile is maintained to support being built both on amd64 and
-#       arm64 architectures.
-#
-# List of Fedora versions: https://en.wikipedia.org/wiki/Fedora_version_history#Version_history
-ARG FEDORA_VERSION=35
-
-
-
-FROM registry.fedoraproject.org/fedora:${FEDORA_VERSION} AS build
-
-# Build ganesha from source, install it to /usr/local and a use multi stage build to have a smaller image
-# Set NFS_V4_RECOV_ROOT to /export
-
-# Install dependencies on separated lines to be easier to track changes using git blame
-RUN dnf install -y \
-	bison \
-	cmake \
-	dbus-devel \
-	flex \
-	tar \
-	gcc \
-	gcc-c++ \
-	git \
-	jemalloc-devel \
-	krb5-devel \
-	libblkid-devel \
-	libnfsidmap-devel \
-	libnsl2-devel \
-	libntirpc-devel \
-	libuuid-devel \
-	ninja-build \
-	patch \
-	userspace-rcu-devel \
-	xfsprogs-devel
-
-# Clone specific version of ganesha
+# Update only after new version of deploy/base/Dockerfile change has built
 ARG GANESHA_VERSION=V3.5
-RUN git clone --branch ${GANESHA_VERSION} --recurse-submodules https://github.com/nfs-ganesha/nfs-ganesha
-WORKDIR /nfs-ganesha
-RUN mkdir -p /usr/local \
-    && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
-          -DBUILD_CONFIG=vfs_only -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_RGW=OFF \
-          -DUSE_RADOS_RECOV=OFF -DRADOS_URLS=OFF -DUSE_SYSTEM_NTIRPC=ON \
-          -G Ninja src/ \
-    && sed -i 's|@SYSSTATEDIR@/lib/nfs/ganesha|/export|' src/include/config-h.in.cmake \
-	  && ninja \
-	  && ninja install
-RUN mkdir -p /ganesha-extra \
-    && mkdir -p /ganesha-extra/etc/dbus-1/system.d \
-    && cp src/scripts/ganeshactl/org.ganesha.nfsd.conf /ganesha-extra/etc/dbus-1/system.d/
 
 
-
-FROM registry.fedoraproject.org/fedora-minimal:${FEDORA_VERSION} AS run
-
-# Install dependencies on separated lines to be easier to track changes using git blame
-RUN microdnf install -y \
-	dbus-x11 \
-	hostname \
-	jemalloc \
-	libblkid \
-	libnfsidmap \
-	libntirpc \
-	libuuid \
-	nfs-utils \
-	rpcbind \
-	userspace-rcu \
-	xfsprogs \
-    && microdnf clean all
-
-RUN mkdir -p /var/run/dbus \
-    && mkdir -p /export
-
-# add libs from /usr/local/lib64
-RUN echo /usr/local/lib64 > /etc/ld.so.conf.d/local_libs.conf
-
-# do not ask systemd for user IDs or groups (slows down dbus-daemon start)
-RUN sed -i s/systemd// /etc/nsswitch.conf
-
-COPY --from=build /usr/local /usr/local/
-COPY --from=build /ganesha-extra /
+FROM ghcr.io/kubernetes-sigs/nfs-ganesha:${GANESHA_VERSION}
 
 ARG binary=nfs-provisioner
 COPY ${binary} /nfs-provisioner
 
-# run ldconfig after libs have been copied
-RUN ldconfig
-
 # expose mountd 20048/tcp and nfsd 2049/tcp and rpcbind 111/tcp 111/udp
 EXPOSE 2049/tcp 20048/tcp 111/tcp 111/udp