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' diff --git a/web/Dockerfile b/web/Dockerfile index eb4394e..ff7fa90 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,23 +1,24 @@ ### 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/ -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 ### STAGE 2: Setup ### -FROM nginx +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