Merge pull request #40 from dineiar/10.2.x

10.2.x

Author: alejandroSuch

Dockerfile

@@ -1,13 +1,20 @@
-FROM node:9.2.0-alpine
+FROM node:14.18.0-alpine
 
-LABEL authors="Alejandro Such <alejandro.such@gmail.com> , Mihai Bob <mihai.m.bob@gmail.com>"
+LABEL authors="Alejandro Such <alejandro.such@gmail.com> , Mihai Bob <mihai.m.bob@gmail.com>, Dinei A. Rockenbach <dineiar@gmail.com>"
 
 RUN apk update \
-  && apk add --update alpine-sdk python \
-  && yarn global add @angular/cli@1.5.5 \
-  && ng set --global packageManager=yarn \
-  && apk del alpine-sdk python \
+  && apk add --update alpine-sdk python3 \
+  && yarn global add @angular/cli@10.2.3 \
+  && ng config --global cli.packageManager yarn \
+  && apk del alpine-sdk python3 \
   && rm -rf /tmp/* /var/cache/apk/* *.tar.gz ~/.npm \
   && npm cache clean --force \
   && yarn cache clean \
   && sed -i -e "s/bin\/ash/bin\/sh/" /etc/passwd
+
+EXPOSE 4200
+
+# Replaces default node entrypoint to allow/force "ng" command by default
+COPY docker-entrypoint.sh /usr/local/bin/
+
+CMD [ "ng" ]

README.md

@@ -7,10 +7,10 @@
                |___/
 ```
 
-**@angular/cli:** 1.5.5<br/>
-**node:** 6.11.2<br/>
-**npm:** 3.10.10<br/>
-**yarn:** 0.24.6<br/>
+**@angular/cli:** 10.2.3<br/>
+**node:** 14.18.0<br/>
+**npm:** 6.14.15<br/>
+**yarn:** 1.22.5<br/>
 **os:** linux x64<br/>
 **package manager:** yarn<br/>
 **docker hub:** https://hub.docker.com/r/alexsuch/angular-cli/
@@ -24,19 +24,19 @@ This image has the same usage as Angular CLI (https://cli.angular.io/)
 ### Creating a project
 
 ```
-docker run -it --rm -w /app -v $(pwd):/app alexsuch/angular-cli:1.5.5 ng new my-project-name
+docker run -it --rm -w /app -v $(pwd):/app alexsuch/angular-cli:10.2.3 ng new my-project-name
 ```
 
 ### Generating a component
 
 ```
-docker run -it --rm -w /app -v $(pwd)/my-project-name:/app alexsuch/angular-cli:1.5.5 ng g component sample-component
+docker run -it --rm -w /app -v $(pwd)/my-project-name:/app alexsuch/angular-cli:10.2.3 ng g component sample-component
 ```
 
 ### Serving
 
 ```
-docker run -it --rm -w /app -v $(pwd)/my-project-name:/app -p 4200:4200 alexsuch/angular-cli:1.5.5 ng serve --host 0.0.0.0
+docker run -it --rm -w /app -v $(pwd)/my-project-name:/app -p 4200:4200 alexsuch/angular-cli:10.2.3 ng serve --host 0.0.0.0
 ```
 
 ## Credits
@@ -49,6 +49,7 @@ This Docker image has been made with ❤️ by [Alejandro Such ](https://twitter
  - [Daniel Schreiber](https://github.com/daniel-sc)
  - [nlko](https://github.com/nlko)
  - [Michaël van de Giessen](https://github.com/tubbynl)
+ - [Dinei A. Rockenbach](https://github.com/dineiar)
 
 ## License
 

docker-entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- ng "$@"
+fi
+
+exec "$@"