Merge pull request #60 from pinceladasdaweb/development

Development

Dockerfile

@@ -1,28 +1,23 @@
-FROM node:16.14.0-alpine
+FROM node:16.17.0-alpine
 
 LABEL maintainer="Pedro Rogério"
 
 # Set the working directory
 WORKDIR /usr/src/app
 
 # Copy source code
-COPY package*.json ./
+COPY --chown=node:node package*.json ./
 
 # Running npm install
-RUN npm install --only=production
+RUN npm ci --omit=dev --ignore-scripts && npm cache clean --force
 
 # Copy the rest of your app's source code from your host to your image filesystem.
-COPY . .
+COPY --chown=node:node . .
 
-# Create a user group 'nodegroup', create a user 'nodeuser' under 'nodegroup' and chown all the files to the app user.
-RUN addgroup -S nodegroup && \
-    adduser -S -D -h /usr/src/app nodeuser nodegroup && \
-    chown -R nodeuser:nodegroup /usr/src
-
-# Switch to 'nodeuser'
-USER nodeuser
+# Switch to 'node' user
+USER node
 
 # Open the mapped port
 EXPOSE 3000
 
-CMD [ "node", "src/index.js" ]
+CMD ["node", "src/index.js"]

Makefile

@@ -1,6 +1,6 @@
 DOCKER := @docker
 COMPOSE := @docker-compose
-NODE := 16.14.0-alpine
+NODE := 16.17.0-alpine
 
 help: ## Show this help message.
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'

README.md

@@ -3,7 +3,7 @@
 Node.js RESTful API boilerplate using Traefik, Docker, Docker Compose, Fastify, JWT and Mongodb.
 
 ## Requirements
-1. Node.js >= 14
+1. Node.js >= 16
 2. Docker
 3. Docker compose
 
@@ -103,9 +103,8 @@ http://localhost:8080
 
 ![](/traefik.png)
 
-Happy coding!
-
+## Infrastructure model
 
-### Infrastructure model
+![Infrastructure model](.infragenie/infrastructure_model.png)
 
-![Infrastructure model](.infragenie/infrastructure_model.png)
+Happy coding!

docker-compose.yml

@@ -3,11 +3,19 @@ version: '3.7'
 services:
   api:
     container_name: api
-    image: node:16.14.0-alpine
+    image: node:16.17.0-alpine
     working_dir: /usr/src/app
     ports:
       - '3000:3000'
-    command: npm run dev
+    command: >
+      /bin/sh -c "
+        echo Waiting for mongodb service start...;
+        while ! nc -z mongo 27017;
+        do
+          sleep 1;
+        done;
+        npm run dev
+      "
     init: true
     volumes:
       - .:/usr/src/app