refactor(dockerfile): split multi-stage docker on 2 files to improve docker build time

PauloGoncalvesBH · PauloGoncalvesBH · commit 0971a56ccb53 · 2022-06-15T00:57:28.000-03:00
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -55,7 +55,8 @@ Você pode contribuir de várias maneiras, sendo as mais conhecidas as seguintes
 É preciso ter os seguintes programas instalados:
 
 - [Git](https://git-scm.com/downloads)
-- [Node.js](https://nodejs.org/pt-br/download/)
+- [Node.js](https://nodejs.org/pt-br/download/) _(opcional)_
+    - Se usar docker não será preciso instalar o Node
 - [Docker](https://www.docker.com/get-started)
 - [Docker-compose](https://docs.docker.com/compose/install/)
 
@@ -75,7 +76,7 @@ make run-dev
 
 1. [Fork](https://help.github.com/articles/fork-a-repo/) este repositório para sua própria conta GitHub, [clone](https://help.github.com/articles/cloning-a-repository/) no seu computador e, em seguida, acesse o diretório criado;
 1. Faça as alterações necessárias;
-1. Faça o seu commit usando `npm run commit`
+1. Faça o seu commit usando `npm run commit` _(opcional)_
 1. Envie um [pull request](https://help.github.com/articles/about-pull-requests/);
 1. Aguarde o resultado das validações realizadas na integração contínua. Caso haja alguma quebra, analise e faça as correções necessárias.
 
@@ -163,7 +164,7 @@ Execute `npm run commit` para ter um painel interativo que permite seguir o padr
 
 ## 💥 Dockerfile lint
 
-É utilizado o linter [Hadolint - Haskell Dockerfile Linter](https://github.com/hadolint/hadolint) para garantir que o [Dockerfile](../Dockerfile) segue as melhores práticas em sua estrutura.
+É utilizado o linter [Hadolint - Haskell Dockerfile Linter](https://github.com/hadolint/hadolint) para garantir que os Dockerfile de [produção](../Dockerfile), [desenvolvimento, teste](../Dockerfile.dev) e de [teste de infra](../Dockerfile) seguem as melhores práticas em sua estrutura.
 
 ---
 
diff --git a/.github/workflows/continuous_delivery.yml b/.github/workflows/continuous_delivery.yml
@@ -42,8 +42,10 @@ jobs:
     steps:
     - name: Project checkout
       uses: actions/checkout@v2
-    - name: Validate production and dev dockerfile (Dockerfile)
+    - name: Validate production dockerfile (Dockerfile)
       run: docker run --rm -i hadolint/hadolint < Dockerfile
+    - name: Validate dev dockerfile (Dockerfile.dev)
+      run: docker run --rm -i hadolint/hadolint < Dockerfile.dev
     - name: Validate terratest dockerfile (Dockerfile.terratest)
       run: docker run --rm -i hadolint/hadolint < Dockerfile.terratest
 
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -52,8 +52,10 @@ jobs:
     steps:
     - name: Project checkout
       uses: actions/checkout@v2
-    - name: Validate production and dev dockerfile (Dockerfile)
+    - name: Validate production dockerfile (Dockerfile)
       run: docker run --rm -i hadolint/hadolint < Dockerfile
+    - name: Validate dev dockerfile (Dockerfile.dev)
+      run: docker run --rm -i hadolint/hadolint < Dockerfile.dev
     - name: Validate terratest dockerfile (Dockerfile.terratest)
       run: docker run --rm -i hadolint/hadolint < Dockerfile.terratest
 
diff --git a/.releaserc.js b/.releaserc.js
@@ -107,7 +107,7 @@ module.exports = {
       ]
     }],
     ['@semantic-release/exec', {
-      prepareCmd: 'docker build -t paulogoncalvesbh/serverest --target prod .'
+      prepareCmd: 'make build'
     }],
     ['semantic-release-docker', {
       name: 'paulogoncalvesbh/serverest'
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,7 @@
 FROM node:lts-alpine3.12@sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b as base
 
+# Production dockerfile
+
 LABEL repository="https://github.com/ServeRest/ServeRest" \
       homepage="https://github.com/ServeRest/ServeRest" \
       maintainer="Paulo Gonçalves <https://www.linkedin.com/in/paulo-goncalves/>"
@@ -8,38 +10,6 @@ WORKDIR /app
 
 COPY package*.json ./
 
-FROM base as test
-
-ENV NODE_ENV=serverest-test
-
-# hadolint ignore=DL3018
-RUN apk --no-cache add git ca-certificates wget=1.21.1-r1 bash \
-  && wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \
-  && wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.29-r0/glibc-2.29-r0.apk \
-  && apk --no-cache add glibc-2.29-r0.apk \
-  && rm -rf /var/cache/apk/*
-
-# hadolint ignore=DL3059
-RUN npm ci
-
-COPY . .
-
-FROM base as dev
-
-ENV NODE_ENV=serverest-development
-ENV USERNAME='docker'
-ENV TERM=xterm-256color
-
-RUN npm ci
-
-COPY . .
-
-EXPOSE 3000
-
-CMD [ "npm", "run", "dev" ]
-
-FROM base as prod
-
 RUN npm ci --production --ignore-scripts
 
 COPY . .
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -0,0 +1,30 @@
+FROM node:lts-alpine3.12@sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b as base
+
+WORKDIR /app
+
+COPY package*.json ./
+
+RUN npm ci
+
+COPY . .
+
+FROM base as test
+
+ENV NODE_ENV=serverest-test
+
+# hadolint ignore=DL3018
+RUN apk --no-cache add git ca-certificates wget=1.21.1-r1 bash \
+  && wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \
+  && wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.29-r0/glibc-2.29-r0.apk \
+  && apk --no-cache add glibc-2.29-r0.apk \
+  && rm -rf /var/cache/apk/*
+
+FROM base as dev
+
+ENV NODE_ENV=serverest-development
+ENV USERNAME='docker'
+ENV TERM=xterm-256color
+
+EXPOSE 3000
+
+CMD [ "npm", "run", "dev" ]
diff --git a/Makefile b/Makefile
@@ -1,15 +1,15 @@
 .PHONY: build run stop clean run-dev test-contract test test-unit test-integration test-mutation-diff test-mutation test-infra
 # serverest 
 
-NAME_IMAGE=serverest/serverest
+NAME_IMAGE=paulogoncalvesbh/serverest
 HOST_PORT=3000
 
 # COMANDOS PARA USAR A IMAGEM DE PRODUÇÃO \/
 
 default: build run
 
 build:
-	@DOCKER_BUILDKIT=1 docker build -t ${NAME_IMAGE} --target prod .
+	@DOCKER_BUILDKIT=1 docker build --file Dockerfile --tag ${NAME_IMAGE} .
 
 run:
 	@docker run -p ${HOST_PORT}:3000 ${NAME_IMAGE}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,13 +4,15 @@ services:
   base:
     build:
       context: .
+      dockerfile: Dockerfile.dev
       target: test
     volumes:
       - ./test:/app/test
 
   run-dev:
     build:
       context: .
+      dockerfile: Dockerfile.dev
       target: dev
     volumes:
       - .:/app
@@ -42,7 +44,7 @@ services:
   run-app-e2e:
     build:
       context: .
-      target: prod
+      dockerfile: Dockerfile
     environment:
       NODE_ENV: 'serverest-development'
 

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ module.exports = {`
`107`	`107`	`]`
`108`	`108`	`}],`
`109`	`109`	`['@semantic-release/exec', {`
`110`		`- prepareCmd: 'docker build -t paulogoncalvesbh/serverest --target prod .'`
	`110`	`+ prepareCmd: 'make build'`
`111`	`111`	`}],`
`112`	`112`	`['semantic-release-docker', {`
`113`	`113`	`name: 'paulogoncalvesbh/serverest'`