From bfbde74586299f67da8698bbd47a329550c07a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Go=CC=88kay=20Gu=CC=88rcan?= <gokaygurcan@gmail.com>
Date: Fri, 26 Apr 2019 22:01:03 +0200
Subject: [PATCH] docker: Housekeeping

---
 .editorconfig | 13 +++++++++++++
 Dockerfile    | 40 +++++++++++++++++-----------------------
 README.md     | 13 +++++--------
 3 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..ecc5ee8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# gokaygurcan/dockerfile-node
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = true
+
+[Dockerfile]
+indent_size = 4
diff --git a/Dockerfile b/Dockerfile
index 44f5490..ec0e784 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,57 +3,51 @@
 FROM gokaygurcan/ubuntu:latest
 
 # metadata
-LABEL maintainer = "Gökay Gürcan <docker@gokaygurcan.com>"
-LABEL com.gokaygurcan.project.name = "dockerfile-node"
-LABEL com.gokaygurcan.project.version = "1.2.2"
-LABEL org.label-schema.name = "dockerfile-node"
-LABEL org.label-schema.description = "Node.js with npm, Yarn and N|Solid."
-LABEL org.label-schema.vcs-url = "https://github.com/gokaygurcan/dockerfile-node"
-LABEL org.label-schema.vendor = "gokaygurcan"
-LABEL org.label-schema.version = "1.2.2"
-LABEL org.label-schema.schema-version = "1.0"
+LABEL maintainer "Gökay Gürcan <docker@gokaygurcan.com>"
 
 ENV DEBIAN_FRONTEND="noninteractive" \
-    USR_SRC_NODE=/usr/src/node \
     NS_NODE=node_10.x \
     NS_NSOLID=nsolid_3.x \
     NS_DISTRO=bionic
 
 USER root
 
-RUN mkdir -p ${USR_SRC_NODE}
-
-WORKDIR ${USR_SRC_NODE}
-RUN curl -sLf -o /dev/null "https://deb.nodesource.com/${NS_NODE}/dists/${NS_DISTRO}/Release" && \
+RUN mkdir -p /usr/src/node && \
+    cd /usr/src/node && \
+    # install node
+    curl -sLf -o /dev/null "https://deb.nodesource.com/${NS_NODE}/dists/${NS_DISTRO}/Release" && \
     curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
-    echo "deb https://deb.nodesource.com/${NS_NODE} ${NS_DISTRO} main" | tee /etc/apt/sources.list.d/nodesource-node.list && \
-    echo "deb-src https://deb.nodesource.com/${NS_NODE} ${NS_DISTRO} main" | tee -a /etc/apt/sources.list.d/nodesource-node.list && \
+    echo "deb https://deb.nodesource.com/${NS_NODE} ${NS_DISTRO} main" | tee /etc/apt/sources.list.d/nsolid.list && \
+    echo "deb-src https://deb.nodesource.com/${NS_NODE} ${NS_DISTRO} main" | tee -a /etc/apt/sources.list.d/nsolid.list && \
     apt-get update -qq && \
     apt-get install -yqq nodejs && \
+    # configure npm
     npm config list > /dev/null 2>&1 && \
     mkdir -p /home/ubuntu/.config && \
     chown -R ubuntu:$(id -gn ubuntu) /home/ubuntu/.config && \
     mkdir -p /home/ubuntu/.npm-global && \
     chown -R ubuntu:$(id -gn ubuntu) /home/ubuntu/.npm-global && \
     npm config --global set prefix /home/ubuntu/.npm-global && \
+    # install yarn
     curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     apt-get update -qq && \
     apt-get install -y yarn && \
+    # install nsolid
     curl -sLf -o /dev/null "http://nsolid-deb.nodesource.com/${NS_NSOLID}/dists/${NS_DISTRO}/Release" && \
     curl -s http://nsolid-deb.nodesource.com/gpgkey/NODESOURCE-NSOLID-GPG-SIGNING-KEY | apt-key add - && \
-    echo "deb http://nsolid-deb.nodesource.com/${NS_NSOLID} ${NS_DISTRO} main" | tee /etc/apt/sources.list.d/nodesource-nsolid.list && \
-    echo "deb-src http://nsolid-deb.nodesource.com/${NS_NSOLID} ${NS_DISTRO} main" | tee -a /etc/apt/sources.list.d/nodesource-nsolid.list && \
+    echo "deb http://nsolid-deb.nodesource.com/${NS_NSOLID} ${NS_DISTRO} main" | tee /etc/apt/sources.list.d/nsolid.list && \
     apt-get update -qq && \
     apt-get install -yqq nsolid-dubnium && \
+    # cleanup
     apt-get autoclean -yqq && \
     apt-get autoremove -yqq && \
-    rm -rf ${USR_SRC_NODE} && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /tmp/* && \
-    rm -rf /var/tmp/*
+    rm -rf /usr/src/* && \
+    rm -rf /var/lib/{apt,dpkg,cache,log}/ && \
+    rm -rf /var/tmp/* && \
+    rm -rf /tmp/*
 
-WORKDIR /usr/bin
+WORKDIR /home/ubuntu
 
 USER ubuntu
 
diff --git a/README.md b/README.md
index 26f2f6b..83f5f38 100644
--- a/README.md
+++ b/README.md
@@ -4,17 +4,12 @@
 
 <h2>Environment variables</h2>
 
-| Name         | Value         |
+| Variable     | Value         |
 | ------------ | ------------- |
-| USR_SRC_NODE | /usr/src/node |
 | NS_NODE      | node_10.x     |
 | NS_NSOLID    | nsolid_3.x    |
 | NS_DISTRO    | bionic        |
 
-<h2>Additional packages</h2>
-
-- lsb-release
-
 <h2>CMD</h2>
 
 ```bash
@@ -27,10 +22,12 @@ To pull the image
 
 ```bash
 docker pull gokaygurcan/node:latest
+```
 
-# or
+And then,
 
-docker pull gokaygurcan/node:dubnium
+```bash
+docker run gokaygurcan/node:latest node -e "console.log(process.versions);"
 ```
 
 ---