zenon/web-application-engineering
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Marco Zeisler 2021-05-12 11:23:15 +02:00
commit 1229a73944
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -132,6 +132,11 @@ docker-build-fe:
script: script:
- docker-compose build waecm_g4_fe - docker-compose build waecm_g4_fe
- docker save -o waecm_g4_fe ${DOCKER_USER}/${ASSIGNMENT}-fe - docker save -o waecm_g4_fe ${DOCKER_USER}/${ASSIGNMENT}-fe
cache:
key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR
paths:
- frontend/node_modules/
policy: pull
extends: extends:
- .docker-build - .docker-build
- .docker-setup - .docker-setup

1
frontend/.dockerignore
View File

@ -1,2 +1 @@
dist dist
node_modules

2
frontend/Dockerfile
View File

@ -6,6 +6,6 @@ WORKDIR /app
COPY . . COPY . .
RUN npm install RUN npm install && npm install chokidar --save
ENTRYPOINT npm run -- ng serve --host 0.0.0.0 --port 4200 ENTRYPOINT npm run -- ng serve --host 0.0.0.0 --port 4200

2
frontend/src/app/validators/keywords.validator.ts
View File

@ -1,7 +1,7 @@
import {AbstractControl} from '@angular/forms'; import {AbstractControl} from '@angular/forms';
export function keywordsValidator(control: AbstractControl): { [key: string]: any } | null { export function keywordsValidator(control: AbstractControl): { [key: string]: any } | null {
if (control.value === undefined) { if (control.value === null) {
return null; return null;
} }
let split: string[]; let split: string[];