Skip to content
This repository was archived by the owner on Feb 24, 2022. It is now read-only.

Mystuff 88 alpine #90

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Mystuff 88 alpine #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
324ac9c
mystuff-88 Change base docker images to alpine
Max-Levitskiy May 13, 2019
bc37895
mystuff-88 Change base docker images to alpine
Max-Levitskiy May 13, 2019
5a03306
Rename pipeline stages
Max-Levitskiy May 13, 2019
8fde064
mystuff-88 Change base docker images to alpine
Max-Levitskiy May 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pipeline/jenkins/validate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ pipeline {
}
}
}
stage('Verify') {
stage('Unit') {
parallel {
stage('Verify back') {
stage('Back') {
environment {
MAVEN_HOME = '/usr/share/maven'
}
Expand All @@ -56,7 +56,7 @@ pipeline {
}
}
}
stage('Validate') {
stage('Units back') {
steps {
dir('back') {
sh 'mvn -B clean verify -Dmaven.test.failure.ignore=true'
Expand All @@ -66,7 +66,7 @@ pipeline {
}
}
}
stage('Verify front') {
stage('Front') {
agent {
kubernetes {
label 'mystuff-validate-node'
Expand All @@ -87,7 +87,7 @@ pipeline {
}
}
}
stage('Validate') {
stage('Units front') {
steps {
dir('web/') {
sh 'npm ci'
Expand Down
17 changes: 9 additions & 8 deletions web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down