Merge pull request #736 from sassoftware/cleanup-dockerfile

Cleanup Dockerfile

Author: ceelias

v4m-container/Dockerfile

@@ -1,86 +1,73 @@
-ARG ALPINE_TAG=latest
-
-# Need glibc to support the OpenShift 'oc' CLI
-# https://hub.docker.com/r/frolvlad/alpine-glibc/
-FROM frolvlad/alpine-glibc:$ALPINE_TAG
+FROM frolvlad/alpine-glibc:latest
 
 # Version of the Viya Monitoring for Kubernetes deployment to download to the container
 ARG V4M_TAG="stable"
-
 ARG OS=linux
 ARG ARCH=amd64
-
 ARG HELM_VER=v3.8.0
 ARG KUBECTL_VER=v1.23.4
 # oc versions: https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/
 ARG OC_VER=4.8
 
-# Setting environment variables
-ENV V4M_PATH=/opt/v4m
-ENV KUBECONFIG=$V4M_PATH/.kube/config
-ENV PATH=$V4M_PATH/bin:$PATH
-ENV KEEP_TMP_DIR=true
+# Set environment variables in a single layer
+ENV V4M_PATH=/opt/v4m \
+    KUBECONFIG=/opt/v4m/.kube/config \
+    PATH=/opt/v4m/bin:$PATH \
+    KEEP_TMP_DIR=true \
+    USER_DIR=/opt/v4m/user_dir \
+    TERM=xterm-256color
 
-RUN mkdir -p $V4M_PATH/bin $V4M_PATH/.kube $V4M_PATH/user_dir
-WORKDIR $V4M_PATH
+# Create directory structure in a single layer
+RUN mkdir -p $V4M_PATH/bin $V4M_PATH/.kube $V4M_PATH/user_dir && \
+    touch ${KUBECONFIG} && \
+    chmod 600 ${KUBECONFIG}
 
-# Create $V4M_PATH/.kube/config if it doesn't exist
-RUN touch ${KUBECONFIG}
+WORKDIR $V4M_PATH
 
-# Copy contents from kubeconfig and user_dir to the container
+# Copy configuration files
 COPY kubeconfig/ /opt/v4m/.kube/
 COPY user_dir/ /opt/v4m/user_dir/
 
-RUN chmod 600 ${KUBECONFIG}
-ENV USER_DIR=/opt/v4m/user_dir
-ENV TERM=xterm-256color
-
-# Dependencies needed for python script
-RUN apk add --no-cache python3 py3-pip
-RUN pip3 install opensearch-py
-
-# Download necessary executables
-RUN set -eux; \
-	apk add --no-cache \
-		bash \
-		coreutils \
-		ncurses \
-		curl \
-		git \
-		jq \
-		wget \
-		yq \
-		openssh \
-		procps \
-		openssl \
-	;
-
-# kubectl
-RUN wget https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VER/bin/$OS/$ARCH/kubectl; \
-    chmod +x ./kubectl; \
-    mv ./kubectl $V4M_PATH/bin/; \
-	mkdir -p $V4M_PATH/.kube;  \
-	touch /opt/v4m/.kube/config
-
-# helm
-RUN	wget https://get.helm.sh/helm-$HELM_VER-$OS-$ARCH.tar.gz; \
-	tar -xvf helm-$HELM_VER-$OS-$ARCH.tar.gz; \
-	mv $OS-$ARCH/helm $V4M_PATH/bin/; \
-	rm -rf $OS-$ARCH; \
-	rm helm-$HELM_VER-$OS-$ARCH.tar.gz
-
-# oc
-RUN mkdir oc; \
-    cd oc; \
-    wget https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-${OC_VER}/openshift-client-${OS}.tar.gz; \
-	tar -xvf openshift-client-${OS}.tar.gz; \
-	mv oc $V4M_PATH/bin/; \
-	cd ..; \
-	rm -rf oc/
-
-# viya4-monitoring-kubernetes
-RUN V4M_BRANCH="$V4M_TAG"; \
-  if [ "$V4M_BRANCH" == "latest" ]; then V4M_BRANCH="stable"; fi; \
-  git clone --depth 1 -b ${V4M_BRANCH} https://github.com/sassoftware/viya4-monitoring-kubernetes
+# Install system dependencies - make sure to complete this step properly
+RUN apk update && \
+    apk add --no-cache \
+    bash \
+    coreutils \
+    ncurses \
+    curl \
+    git \
+    jq \
+    wget \
+    yq \
+    openssh \
+    procps \
+    openssl \
+    python3 \
+    py3-pip
+
+# Install opensearch-py using apk and create a symlink if needed
+RUN pip3 install --break-system-packages opensearch-py
+
+# Install binaries
+RUN wget -q https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VER/bin/$OS/$ARCH/kubectl && \
+    chmod +x ./kubectl && \
+    mv ./kubectl $V4M_PATH/bin/ && \
+    # Install helm
+    wget -q https://get.helm.sh/helm-$HELM_VER-$OS-$ARCH.tar.gz && \
+    tar -xf helm-$HELM_VER-$OS-$ARCH.tar.gz && \
+    mv $OS-$ARCH/helm $V4M_PATH/bin/ && \
+    # Install oc
+    wget -q https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-${OC_VER}/openshift-client-${OS}.tar.gz && \
+    tar -xf openshift-client-${OS}.tar.gz && \
+    mv oc $V4M_PATH/bin/ && \
+    # Clone repository
+    V4M_BRANCH="${V4M_TAG}" && \
+    if [ "$V4M_BRANCH" == "latest" ]; then V4M_BRANCH="stable"; fi && \
+    git clone --depth 1 -b ${V4M_BRANCH} https://github.com/sassoftware/viya4-monitoring-kubernetes && \
+    # Cleanup
+    rm -rf helm-$HELM_VER-$OS-$ARCH.tar.gz $OS-$ARCH openshift-client-${OS}.tar.gz
 
 WORKDIR $V4M_PATH/viya4-monitoring-kubernetes
+
+# Add a health check or default CMD if appropriate
+CMD ["bash"]