Compare commits

...

2 Commits
main ... noEdit

Author SHA1 Message Date
Administrator
a1e91df680 Update .gitlab-ci.yml file 2022-05-06 23:57:11 +00:00
b8a6e365d1 No Edit 2022-05-01 23:10:17 +02:00
2 changed files with 31 additions and 24 deletions

View File

@ -5,6 +5,10 @@ stages: # List of stages for jobs, and their order of execution
variables: variables:
FF_USE_FASTZIP: "true"
# These can be specified per job or per pipeline
ARTIFACT_COMPRESSION_LEVEL: "fast"
CACHE_COMPRESSION_LEVEL: "fast"
CI_REGISTRY_IMAGE: docker.dergeorg.at/dergeorg CI_REGISTRY_IMAGE: docker.dergeorg.at/dergeorg
SERVICE: todo-frontend SERVICE: todo-frontend
Docker_name: gitlab-todo-frontend Docker_name: gitlab-todo-frontend
@ -14,7 +18,7 @@ variables:
Docker_namespace: dergeorg Docker_namespace: dergeorg
DOCKER_TAG: latest DOCKER_TAG: latest
ENV: test ENV: test
PORT_HOST: 9998 PORT_HOST: 8889
PORT_CONTAINER: 80 PORT_CONTAINER: 80
EUREKA_HOSTNAME: 192.168.1.65 EUREKA_HOSTNAME: 192.168.1.65
EUREKA_PORT: 9995 EUREKA_PORT: 9995
@ -22,16 +26,27 @@ variables:
CONFIG_URL: service.todo.gitlab.dergeorg.at CONFIG_URL: service.todo.gitlab.dergeorg.at
CONFIG_HTTP: https CONFIG_HTTP: https
cache:
policy: pull-push
key: NPM_DOWNLOAD_CACHE
paths:
- .npm/
build-job: # Building jar file build-job: # Building jar file
image: nginx:1.17.1-alpine image: node:lts-alpine
stage: build stage: build
script: script:
- ls src/environments/
- echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.ts
- echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.prod.ts - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.prod.ts
- npm install - npm ci --cache .npm --prefer-offline
- npm run build - npm install -g @angular/cli
- ng build --prod
- ls
artifacts: artifacts:
paths: paths:
- target/*.jar - dist/
publish-job: # Building docker image and publishing it publish-job: # Building docker image and publishing it
image: docker:latest image: docker:latest
@ -39,8 +54,8 @@ publish-job: # Building docker image and publishing it
services: services:
- docker:dind - docker:dind
script: script:
- docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW - docker login -u $DOCKER_USER -p $DOCKER_PW $DOCKER_URL
- docker build -t $DOCKER_URL/$TAG_LATEST . - docker build -t $DOCKER_URL/$TAG_LATEST --cache-from $DOCKER_URL/$TAG_LATEST .
- docker push $DOCKER_URL/$TAG_LATEST - docker push $DOCKER_URL/$TAG_LATEST
deploy-job: # Deploy docker image on ssh server deploy-job: # Deploy docker image on ssh server
@ -60,4 +75,4 @@ deploy-job: # Deploy docker image on ssh server
- ssh $SSH_USER@$SERVER_IP "docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW" - ssh $SSH_USER@$SERVER_IP "docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW"
- ssh $SSH_USER@$SERVER_IP "docker push $DOCKER_URL/$TAG_LATEST" - ssh $SSH_USER@$SERVER_IP "docker push $DOCKER_URL/$TAG_LATEST"
- ssh $SSH_USER@$SERVER_IP "docker container rm -f $Docker_name || true" - ssh $SSH_USER@$SERVER_IP "docker container rm -f $Docker_name || true"
- ssh $SSH_USER@$SERVER_IP "docker run -it -d --name $Docker_name -e -p $PORT_HOST:$PORT_CONTAINER $DOCKER_URL/$TAG_LATEST" - ssh $SSH_USER@$SERVER_IP "docker run -it -d --name $Docker_name -p $PORT_HOST:$PORT_CONTAINER $DOCKER_URL/$TAG_LATEST"

View File

@ -1,16 +1,8 @@
<mat-card class="task"> <!-- Terminal -->
<mat-card-header class="header"> <div class="terminal" >
<mat-card-title class="title">{{this.taskObj.name}}</mat-card-title> <pre>{{this.taskObj.name}}</pre>
<mat-card-subtitle class="sub">{{this.date}}</mat-card-subtitle> <pre>{{this.taskObj.id}}</pre>
</mat-card-header> <pre>{{this.taskObj.description}}</pre>
<hr> <pre>{{this.taskObj.state}}</pre>
<mat-card-content class="content"> <pre>{{this.taskObj.date}}</pre>
<p> </div>
{{this.taskObj.description}}
</p>
</mat-card-content>
<mat-card-actions>
<button (click)="delete(this.taskObj.id)" mat-mini-fab class="edit-btn"><mat-icon>delete</mat-icon></button>
<button (click)="openDialog()" mat-mini-fab class="edit-btn"><mat-icon>edit</mat-icon></button>
</mat-card-actions>
</mat-card>