Fix dockerfile

Author: lresende

etc/docker/demo-base/Dockerfile

@@ -9,23 +9,23 @@ ARG NB_GID="100"
 
 USER root
 
-ENV HADOOP_HOME=/usr/hdp/current/hadoop \
-    ANACONDA_HOME=/opt/conda
-
-ENV SHELL=/bin/bash \
-    NB_USER=$NB_USER \
-    NB_UID=$NB_UID \
-    NB_GID=$NB_GID \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    LANGUAGE=en_US.UTF-8 \
-    JAVA_HOME=/usr/lib/jvm/java \
-    SPARK_HOME=/usr/hdp/current/spark2-client \
-    PYSPARK_PYTHON=$ANACONDA_HOME/bin/python \
-    HADOOP_CONF_DIR=$HADOOP_HOME/etc/hadoop
-
-ENV HOME=/home/$NB_USER \
-    PATH=$JAVA_HOME/bin:$ANACONDA_HOME/bin:$HADOOP_HOME/bin:$SPARK_HOME/bin:$PATH
+ENV HADOOP_HOME /usr/hdp/current/hadoop
+ENV ANACONDA_HOME /opt/conda
+
+ENV SHELL /bin/bash \
+    NB_USER $NB_USER \
+    NB_UID $NB_UID \
+    NB_GID $NB_GID \
+    LC_ALL en_US.UTF-8 \
+    LANG en_US.UTF-8 \
+    LANGUAGE en_US.UTF-8 \
+    JAVA_HOME /usr/lib/jvm/java \
+    SPARK_HOME /usr/hdp/current/spark2-client \
+    PYSPARK_PYTHON $ANACONDA_HOME/bin/python \
+    HADOOP_CONF_DIR $HADOOP_HOME/etc/hadoop
+
+ENV HOME /home/$NB_USER
+ENV PATH $JAVA_HOME/bin:$ANACONDA_HOME/bin:$HADOOP_HOME/bin:$SPARK_HOME/bin:$PATH
 
 ENV SPARK_VER $SPARK_VERSION
 ENV HADOOP_VER 3.3.1
@@ -56,7 +56,7 @@ RUN dpkg --purge --force-depends ca-certificates-java \
     && apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security main' \
     && apt-add-repository 'deb http://deb.debian.org/debian/ sid main' \
     && apt-get update && apt-get install -yq --no-install-recommends  \
-    openjdk-8-jre-headless \
+    openjdk-8-jdk-headless \
     ca-certificates-java \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
@@ -71,14 +71,14 @@ ADD fix-permissions /usr/local/bin/fix-permissions
 # and make sure these dirs are writable by the `users` group.
 RUN groupadd wheel -g 11 && \
     echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su && \
-    useradd -m -s /bin/bash -N -u $NB_UID $NB_USER && \
+    useradd -m -s /bin/bash -N -u "$NB_UID" "$NB_USER" && \
     mkdir -p /usr/hdp/current && \
     mkdir -p /usr/local/share/jupyter && \
-    chown $NB_USER:$NB_GID $ANACONDA_HOME && \
+    chown "$NB_USER":"$NB_GID" "$ANACONDA_HOME" && \
     chmod g+w /etc/passwd && \
     chmod +x /usr/local/bin/fix-permissions && \
-    fix-permissions $HOME && \
-    fix-permissions $ANACONDA_HOME && \
+    fix-permissions "$HOME" && \
+    fix-permissions "$ANACONDA_HOME" && \
     fix-permissions /usr/hdp/current && \
     fix-permissions /usr/local/share/jupyter
 
@@ -90,8 +90,8 @@ RUN useradd -m -s /bin/bash -N -u 1111 elyra && \
 USER $NB_UID
 
 # Setup work directory for backward-compatibility
-RUN mkdir /home/$NB_USER/work && \
-    fix-permissions /home/$NB_USER
+RUN mkdir "/home/$NB_USER/work" && \
+    fix-permissions "/home/$NB_USER"
 
 # DOWNLOAD HADOOP AND SPARK
 RUN curl -sL https://archive.apache.org/dist/hadoop/common/hadoop-$HADOOP_VER/hadoop-$HADOOP_VER.tar.gz | tar -xz -C /usr/hdp/current
@@ -109,8 +109,8 @@ RUN conda install mamba -n base -c conda-forge && \
     'r-argparse' \
     'python=3.10' && \
     mamba clean -y --all &&\
-    fix-permissions $ANACONDA_HOME && \
-    fix-permissions /home/$NB_USER
+    fix-permissions "$ANACONDA_HOME" && \
+    fix-permissions "/home/$NB_USER"
 
 USER $NB_UID
 
@@ -142,8 +142,8 @@ RUN cd /tmp && \
     pip install /tmp/toree-0.5.0.tar.gz && \
     jupyter toree install --spark_home=$SPARK_HOME --kernel_name="Spark $SPARK_VER" --interpreters=Scala && \
     rm -f /tmp/toree-0.5.0.tar.gz && \
-    fix-permissions $ANACONDA_HOME && \
-    fix-permissions /home/$NB_USER
+    fix-permissions "$ANACONDA_HOME" && \
+    fix-permissions "/home/$NB_USER"
 
 # SETUP PASSWORDLESS SSH FOR $NB_USER
 RUN ssh-keygen -q -N "" -t rsa -f /home/$NB_USER/.ssh/id_rsa && \

etc/docker/demo-base/fix-permissions

@@ -20,10 +20,10 @@ set -e
 for d in "$@"; do
   find "$d" \
     ! \( \
-      -group $NB_GID \
+      -group "$NB_GID" \
       -a -perm -g+rwX  \
     \) \
-    -exec chgrp $NB_GID {} \; \
+    -exec chgrp "$NB_GID" {} \; \
     -exec chmod g+rwX {} \;
   # setuid,setgid *on directories only*
   find "$d" \

etc/docker/enterprise-gateway-demo/Dockerfile

@@ -10,8 +10,8 @@ FROM $BASE_CONTAINER
 # use an ARG instruction without a value inside of a build stage:
 ARG SPARK_VERSION
 
-ENV NB_USER="jovyan"
-ENV SPARK_VER=${SPARK_VERSION}
+ENV NB_USER "jovyan"
+ENV SPARK_VER ${SPARK_VERSION}
 
 USER $NB_USER
 

etc/docker/kernel-py/Dockerfile

@@ -2,7 +2,7 @@
 ARG BASE_CONTAINER=jupyter/scipy-notebook:2023-03-13
 FROM $BASE_CONTAINER
 
-ENV PATH=$PATH:$CONDA_DIR/bin
+ENV PATH $PATH:$CONDA_DIR/bin
 
 # Add debugger support
 RUN pip install --upgrade ipykernel