Refactored docker stack to use the same Dockerfile used on all NodeJS Quickstarts.

Signed-off-by: Exadra37 <[email protected]>

Author: Exadra37

servers/shapes-api/docker/Dockerfile

@@ -1,82 +1,47 @@
-FROM ubuntu:18.04
+ARG TAG=17.7.1-slim
 
-# Inspired on:
-#   → https://github.com/Purik/android-studio-docker
-#   → https://github.com/Deadolus/android-studio-docker
+FROM node:${TAG}
 
 ARG CONTAINER_USER="node"
-ARG CONTAINER_UID="1000"
-ARG DISPLAY=":0.0"
-ARG ZSH_THEME="robbyrussell"
+ARG LANGUAGE_CODE="en"
+ARG COUNTRY_CODE="GB"
+ARG ENCODING="UTF-8"
 
-# Will not prompt for questions
-ENV DEBIAN_FRONTEND=noninteractive \
-    CONTAINER_USER=node \
-    CONTAINER_UID=1000 \
-    ROOT_CA_DIR=/root-ca/ \
-    PROXY_CA_FILENAME="FirewallProxyCA.crt" \
-    PROXY_CA_PEM="certificates/FirewallProxyCA.crt" \
-    PROXY_CA_NAME="FirewallProxyCA" \
-    DISPLAY=${DISPLAY} \
-    NO_AT_BRIDGE=1
+ARG LOCALE_STRING="${LANGUAGE_CODE}_${COUNTRY_CODE}"
+ARG LOCALIZATION="${LOCALE_STRING}.${ENCODING}"
 
-# NO_AT_BRIDGE=1
-# Removes DBUS warning that should be only seen by Developer
-# https://bugs.launchpad.net/ubuntu/+source/at-spi2-core/+bug/1193236
+ARG OH_MY_ZSH_THEME="bira"
 
-COPY ./setup ${ROOT_CA_DIR}
-
-RUN apt update && \
-    apt -y upgrade && \
+RUN apt update && apt -y upgrade && \
     apt -y install \
-      locales \
-      tzdata \
-      ca-certificates \
-      inotify-tools \
-      libnss3-tools \
-      curl \
-      git \
-      zsh \
-      unzip \
-      nodejs \
-      npm \
-      libxss1 && \
-
-    locale-gen en_GB.UTF-8 && \
-    dpkg-reconfigure locales && \
-
-    # https://github.com/guard/listen/wiki/Increasing-the-amount-of-inotify-watchers
-    printf "fs.inotify.max_user_watches=524288\n" >> /etc/sysctl.conf && \
+        locales \
+        git \
+        curl \
+        inotify-tools \
+        zsh && \
 
-    # add unprivileged user
-    useradd -m -u ${CONTAINER_UID} -s /bin/bash ${CONTAINER_USER} && \
+        echo "${LOCALIZATION} ${ENCODING}" > /etc/locale.gen && \
+        locale-gen "${LOCALIZATION}" && \
 
-    # Useful when running behind a corporate firewall or a proxy
-    cd ${ROOT_CA_DIR} && \
-    ./add-proxy-certificate.sh "${PROXY_CA_PEM}" && \
-    ./add-certificate-to-node-server.sh "/etc/ssl/certs/${PROXY_CA_NAME}.pem" && \
+        # useradd -m -u 1000 -s /usr/bin/zsh "${CONTAINER_USER}" && \
 
-    # Install Oh My Zsh for Root and Node user
-    bash -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" && \
-    chsh -s /usr/bin/zsh && \
-    cp -R /root/.oh-my-zsh /home/"${CONTAINER_USER}" && \
-    cp /root/.zsh* /home/"${CONTAINER_USER}" && \
-    sed -i "s/\/root/\/home\/${CONTAINER_USER}/g" /home/"${CONTAINER_USER}"/.zshrc && \
-    chown -R "${CONTAINER_USER}":"${CONTAINER_USER}" /home/"${CONTAINER_USER}" && \
-    echo PATH=/opt/android-studio/bin:$PATH >> /home/${CONTAINER_USER}/.bashrc && \
-    echo PATH=/opt/android-studio/bin:$PATH >> /home/${CONTAINER_USER}/.zshrc && \
-    sed -i s/ZSH_THEME=\"robbyrussell\"/ZSH_THEME=\"${ZSH_THEME}\"/g /home/${CONTAINER_USER}/.zshrc && \
+        bash -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" && \
 
-    # Install node in a more current version
-    curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
-    apt install -y nodejs
-
-ENV LANG=en_GB.UTF-8 \
-    LANGUAGE=en_GB:en \
-    LC_ALL=en_GB.UTF-8
+        cp -v /root/.zshrc /home/"${CONTAINER_USER}"/.zshrc && \
+        cp -rv /root/.oh-my-zsh /home/"${CONTAINER_USER}"/.oh-my-zsh && \
+        sed -i "s/\/root/\/home\/${CONTAINER_USER}/g" /home/"${CONTAINER_USER}"/.zshrc && \
+        sed -i s/ZSH_THEME=\"robbyrussell\"/ZSH_THEME=\"${OH_MY_ZSH_THEME}\"/g /home/${CONTAINER_USER}/.zshrc && \
+        mkdir /home/"${CONTAINER_USER}"/workspace && \
+        chown -R "${CONTAINER_USER}":"${CONTAINER_USER}" /home/"${CONTAINER_USER}"
 
 USER ${CONTAINER_USER}
 
+ENV USER ${CONTAINER_USER}
+ENV LANG "${LOCALIZATION}"
+ENV LANGUAGE "${LOCALE_STRING}:${LANGUAGE_CODE}"
+ENV PATH=/home/${CONTAINER_USER}/.local/bin:${PATH}
+ENV LC_ALL "${LOCALIZATION}"
+
 WORKDIR /home/${CONTAINER_USER}/workspace
 
 CMD ["zsh"]