From e2195b4c357847da2e8e0db71096d34fc10015ce Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 8 Jul 2018 20:47:46 +0800 Subject: [PATCH 1/6] [Dockerfile] Use LABEL instead of deprecated MAINTAINER command --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 79cb15b..314285e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ # Use Ubuntu Trusty Tahr as base image as we're using on Travis CI # I also tested with Ubuntu 16.04, should be good with it! From ubuntu:14.04 -MAINTAINER Peter Dave Hello +LABEL maintainer="Peter Dave Hello " # Prevent dialog during apt install ENV DEBIAN_FRONTEND noninteractive From 265ec905326df95f4cdb86d78747ff8a3c84e321 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 8 Jul 2018 21:00:23 +0800 Subject: [PATCH 2/6] [Dockerfile] Add missing name & version LABEL --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 314285e..d972cfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,8 @@ # I also tested with Ubuntu 16.04, should be good with it! From ubuntu:14.04 LABEL maintainer="Peter Dave Hello " +LABEL name="nvm-dev-env" +LABEL version="latest" # Prevent dialog during apt install ENV DEBIAN_FRONTEND noninteractive From af8038ffecaf1f21315fa1e588126ec5d205e056 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 8 Jul 2018 21:40:17 +0800 Subject: [PATCH 3/6] [Dockerfile] Update ShellCheck version to v0.5.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d972cfd..9695df6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ LABEL version="latest" ENV DEBIAN_FRONTEND noninteractive # ShellCheck version -ENV SHELLCHECK_VERSION=0.4.7 +ENV SHELLCHECK_VERSION=0.5.0 # Pick a Ubuntu apt mirror site for better speed # ref: https://launchpad.net/ubuntu/+archivemirrors From f121e5ace02638532e8be5bfabf36cc6edb12a74 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 9 Jul 2018 05:31:20 +0800 Subject: [PATCH 4/6] [Dockerfile] Add missing quotes for variables --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9695df6..621ac3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,10 +93,10 @@ USER nvm # nvm COPY . /home/nvm/.nvm/ -RUN sudo chown nvm:nvm -R $HOME/.nvm -RUN echo 'export NVM_DIR="$HOME/.nvm"' >> $HOME/.bashrc -RUN echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> $HOME/.bashrc -RUN echo '[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> $HOME/.bashrc +RUN sudo chown nvm:nvm -R "$HOME/.nvm" +RUN echo 'export NVM_DIR="$HOME/.nvm"' >> "$HOME/.bashrc" +RUN echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> "$HOME/.bashrc" +RUN echo '[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> "$HOME/.bashrc" # nodejs and tools RUN bash -c 'source $HOME/.nvm/nvm.sh && \ From aacb0b9b97ea8ca7ca47c465c5d5ba8e549bf4a2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 9 Jul 2018 06:07:41 +0800 Subject: [PATCH 5/6] [Dockerfile] Fix command `From` to be `FROM` --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 621ac3f..50c11ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ # Use Ubuntu Trusty Tahr as base image as we're using on Travis CI # I also tested with Ubuntu 16.04, should be good with it! -From ubuntu:14.04 +FROM ubuntu:14.04 LABEL maintainer="Peter Dave Hello " LABEL name="nvm-dev-env" LABEL version="latest" From 04b35b544077d3d7833a788f8d806de085eb9cbf Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 9 Jul 2018 06:09:30 +0800 Subject: [PATCH 6/6] [Dockerfile] Use arguments JSON notation for ENTRYPOINT --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 50c11ee..49bc3c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -107,4 +107,4 @@ RUN bash -c 'source $HOME/.nvm/nvm.sh && \ # Set WORKDIR to nvm directory WORKDIR /home/nvm/.nvm -ENTRYPOINT /bin/bash +ENTRYPOINT ["/bin/bash"]