From 324ac9c1fdad950fb78306ab4b484749989be748 Mon Sep 17 00:00:00 2001
From: Max Levitskiy <max.dstu@gmail.com>
Date: Mon, 13 May 2019 18:44:02 +0200
Subject: [PATCH 1/4] mystuff-88 Change base docker images to alpine

---
 web/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index eb4394e..a2c1975 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -13,7 +13,7 @@ RUN $(npm bin)/ng build --prod --build-optimizer
 #RUN npm update && ng serve --prod
 
 ### STAGE 2: Setup ###
-FROM nginx
+FROM nginx:1.16.0-alpine
 #FROM janeczku/debian-nginx
 
 RUN apt-get update

From bc37895a1ce104db8ba63a32cb29476a7e794d0b Mon Sep 17 00:00:00 2001
From: Max Levitskiy <max.dstu@gmail.com>
Date: Mon, 13 May 2019 20:25:24 +0200
Subject: [PATCH 2/4] mystuff-88 Change base docker images to alpine Fix alpine

---
 web/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index a2c1975..5fcba0b 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -6,9 +6,9 @@ RUN npm set progress=false && npm config set depth 0
 RUN mkdir /web
 WORKDIR /web
 COPY . .
-RUN npm config set registry http://registry.npmjs.org/
-RUN npm i
-RUN $(npm bin)/ng build --prod --build-optimizer
+RUN npm config set registry http://registry.npmjs.org/ \
+    npm ci \
+    $(npm bin)/ng build --prod --build-optimizer
 
 #RUN npm update && ng serve --prod
 
@@ -16,8 +16,8 @@ RUN $(npm bin)/ng build --prod --build-optimizer
 FROM nginx:1.16.0-alpine
 #FROM janeczku/debian-nginx
 
-RUN apt-get update
-RUN apt-get -y install jq
+RUN apk update \
+    apk add jq
 
 # set back-url
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf

From 5a033060e1a3bcd2c9dd67ca542b80984e0c524f Mon Sep 17 00:00:00 2001
From: Max Levitskiy <max.dstu@gmail.com>
Date: Mon, 13 May 2019 20:44:44 +0200
Subject: [PATCH 3/4] Rename pipeline stages

---
 pipeline/jenkins/validate.groovy | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pipeline/jenkins/validate.groovy b/pipeline/jenkins/validate.groovy
index 9a91ff5..d0834b0 100644
--- a/pipeline/jenkins/validate.groovy
+++ b/pipeline/jenkins/validate.groovy
@@ -30,9 +30,9 @@ pipeline {
                 }
             }
         }
-        stage('Verify') {
+        stage('Unit') {
             parallel {
-                stage('Verify back') {
+                stage('Back') {
                     environment {
                         MAVEN_HOME = '/usr/share/maven'
                     }
@@ -56,7 +56,7 @@ pipeline {
                                 }
                             }
                         }
-                        stage('Validate') {
+                        stage('Units back') {
                             steps {
                                 dir('back') {
                                     sh 'mvn -B clean verify -Dmaven.test.failure.ignore=true'
@@ -66,7 +66,7 @@ pipeline {
                         }
                     }
                 }
-                stage('Verify front') {
+                stage('Front') {
                     agent {
                         kubernetes {
                             label 'mystuff-validate-node'
@@ -87,7 +87,7 @@ pipeline {
                                 }
                             }
                         }
-                        stage('Validate') {
+                        stage('Units front') {
                             steps {
                                 dir('web/') {
                                     sh 'npm ci'

From 8fde064350a7eb11e787b26c334df5e46b578409 Mon Sep 17 00:00:00 2001
From: Max Levitskiy <max.dstu@gmail.com>
Date: Mon, 13 May 2019 21:26:06 +0200
Subject: [PATCH 4/4] mystuff-88 Change base docker images to alpine Fix
 dockerfile

---
 web/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index 5fcba0b..ff7fa90 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,13 +1,14 @@
 ### STAGE 1: Build ###
-FROM node:8-alpine as builder
+FROM node:12.2.0-alpine as builder
 
-RUN npm set progress=false && npm config set depth 0
+RUN npm set progress=false && \
+    npm config set depth 0
 #&& npm cache clean --force
 RUN mkdir /web
 WORKDIR /web
 COPY . .
-RUN npm config set registry http://registry.npmjs.org/ \
-    npm ci \
+RUN npm config set registry http://registry.npmjs.org/ &&\
+    npm ci && \
     $(npm bin)/ng build --prod --build-optimizer
 
 #RUN npm update && ng serve --prod
@@ -16,7 +17,7 @@ RUN npm config set registry http://registry.npmjs.org/ \
 FROM nginx:1.16.0-alpine
 #FROM janeczku/debian-nginx
 
-RUN apk update \
+RUN apk update && \
     apk add jq
 
 # set back-url