From 64d091e352c080d5ced2f99752990768c4f07a87 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 30 Apr 2022 12:21:19 +0000 Subject: [PATCH 1/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..04047bb --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,63 @@ +stages: # List of stages for jobs, and their order of execution + - build + - docker + - deploy + + +variables: + CI_REGISTRY_IMAGE: docker.dergeorg.at/dergeorg + SERVICE: todo-frontend + Docker_name: gitlab-todo-frontend + TAG_LATEST: $CI_REGISTRY_IMAGE/$Docker_name:latest + Project_name: todo-frontend + Docker_url: docker.dergeorg.at + Docker_namespace: dergeorg + DOCKER_TAG: latest + ENV: test + PORT_HOST: 9998 + PORT_CONTAINER: 80 + EUREKA_HOSTNAME: 192.168.1.65 + EUREKA_PORT: 9995 + CONFIG_PORT: 1111 + CONFIG_URL: service.todo.gitlab.dergeorg.at + CONFIG_HTTP: https + +build-job: # Building jar file + image: maven:3.6.3-jdk-11-slim + stage: build + script: + - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.prod.ts + - npm install + - npm run build + artifacts: + paths: + - target/*.jar + +publish-job: # Building docker image and publishing it + image: docker:latest + stage: docker + services: + - docker:dind + script: + - docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW + - docker build -t $DOCKER_URL/$TAG_LATEST . + - docker push $DOCKER_URL/$TAG_LATEST + +deploy-job: # Deploy docker image on ssh server + image: alpine:latest + stage: deploy + tags: + - deployment + before_script: + - 'command -v ssh-agent >/dev/null || ( apk add --update openssh )' + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-keyscan $SERVER_IP >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + script: + - 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 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" From fd2a2fa1e4ab502456dd7be06286687b314e5178 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 30 Apr 2022 12:22:45 +0000 Subject: [PATCH 2/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04047bb..0084212 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ variables: CONFIG_HTTP: https build-job: # Building jar file - image: maven:3.6.3-jdk-11-slim + image: nginx:1.17.1-alpine stage: build script: - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.prod.ts From b8a6e365d12d28a55a611f55e5d5e7f7a30a18b0 Mon Sep 17 00:00:00 2001 From: dergeorg Date: Sun, 1 May 2022 23:10:17 +0200 Subject: [PATCH 3/6] No Edit --- src/app/task/task.component.html | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/app/task/task.component.html b/src/app/task/task.component.html index 492e6d7..2246003 100644 --- a/src/app/task/task.component.html +++ b/src/app/task/task.component.html @@ -1,16 +1,8 @@ - - - {{this.taskObj.name}} - {{this.date}} - -
- -

- {{this.taskObj.description}} -

-
- - - - -
+ +
+
{{this.taskObj.name}}
+
{{this.taskObj.id}}
+
{{this.taskObj.description}}
+
{{this.taskObj.state}}
+
{{this.taskObj.date}}
+
From 098dabb31b2f08bead3f36b9e534c00b9b81d493 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 6 May 2022 23:10:44 +0000 Subject: [PATCH 4/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0084212..340e767 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,10 @@ stages: # List of stages for jobs, and their order of execution 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 SERVICE: todo-frontend Docker_name: gitlab-todo-frontend @@ -14,7 +18,7 @@ variables: Docker_namespace: dergeorg DOCKER_TAG: latest ENV: test - PORT_HOST: 9998 + PORT_HOST: 8889 PORT_CONTAINER: 80 EUREKA_HOSTNAME: 192.168.1.65 EUREKA_PORT: 9995 @@ -22,16 +26,27 @@ variables: CONFIG_URL: service.todo.gitlab.dergeorg.at CONFIG_HTTP: https +cache: + policy: pull-push + key: NPM_DOWNLOAD_CACHE + paths: + - .npm/ + build-job: # Building jar file - image: nginx:1.17.1-alpine + image: node:lts-alpine stage: build script: + - ls src/environments/ + - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.ts - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.prod.ts - - npm install - - npm run build + - npm ci --cache .npm --prefer-offline + - npm install -g @angular/cli + - ng build --prod + - ls artifacts: paths: - - target/*.jar + - dist/ + publish-job: # Building docker image and publishing it image: docker:latest @@ -39,8 +54,8 @@ publish-job: # Building docker image and publishing it services: - docker:dind script: - - docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW - - docker build -t $DOCKER_URL/$TAG_LATEST . + - docker login -u $DOCKER_USER -p $DOCKER_PW $DOCKER_URL + - docker build -t $DOCKER_URL/$TAG_LATEST --cache-from $DOCKER_URL/$TAG_LATEST . - docker push $DOCKER_URL/$TAG_LATEST 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 push $DOCKER_URL/$TAG_LATEST" - 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" From 2da30e6f574eb224f2813d1e1ea855f7788f96c4 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 6 May 2022 23:10:50 +0000 Subject: [PATCH 5/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0084212..340e767 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,10 @@ stages: # List of stages for jobs, and their order of execution 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 SERVICE: todo-frontend Docker_name: gitlab-todo-frontend @@ -14,7 +18,7 @@ variables: Docker_namespace: dergeorg DOCKER_TAG: latest ENV: test - PORT_HOST: 9998 + PORT_HOST: 8889 PORT_CONTAINER: 80 EUREKA_HOSTNAME: 192.168.1.65 EUREKA_PORT: 9995 @@ -22,16 +26,27 @@ variables: CONFIG_URL: service.todo.gitlab.dergeorg.at CONFIG_HTTP: https +cache: + policy: pull-push + key: NPM_DOWNLOAD_CACHE + paths: + - .npm/ + build-job: # Building jar file - image: nginx:1.17.1-alpine + image: node:lts-alpine stage: build script: + - ls src/environments/ + - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.ts - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.prod.ts - - npm install - - npm run build + - npm ci --cache .npm --prefer-offline + - npm install -g @angular/cli + - ng build --prod + - ls artifacts: paths: - - target/*.jar + - dist/ + publish-job: # Building docker image and publishing it image: docker:latest @@ -39,8 +54,8 @@ publish-job: # Building docker image and publishing it services: - docker:dind script: - - docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW - - docker build -t $DOCKER_URL/$TAG_LATEST . + - docker login -u $DOCKER_USER -p $DOCKER_PW $DOCKER_URL + - docker build -t $DOCKER_URL/$TAG_LATEST --cache-from $DOCKER_URL/$TAG_LATEST . - docker push $DOCKER_URL/$TAG_LATEST 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 push $DOCKER_URL/$TAG_LATEST" - 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" From d973629de0601fc95932125821e680eaad84eae7 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 6 May 2022 23:10:56 +0000 Subject: [PATCH 6/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0084212..340e767 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,10 @@ stages: # List of stages for jobs, and their order of execution 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 SERVICE: todo-frontend Docker_name: gitlab-todo-frontend @@ -14,7 +18,7 @@ variables: Docker_namespace: dergeorg DOCKER_TAG: latest ENV: test - PORT_HOST: 9998 + PORT_HOST: 8889 PORT_CONTAINER: 80 EUREKA_HOSTNAME: 192.168.1.65 EUREKA_PORT: 9995 @@ -22,16 +26,27 @@ variables: CONFIG_URL: service.todo.gitlab.dergeorg.at CONFIG_HTTP: https +cache: + policy: pull-push + key: NPM_DOWNLOAD_CACHE + paths: + - .npm/ + build-job: # Building jar file - image: nginx:1.17.1-alpine + image: node:lts-alpine stage: build script: + - ls src/environments/ + - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.ts - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.prod.ts - - npm install - - npm run build + - npm ci --cache .npm --prefer-offline + - npm install -g @angular/cli + - ng build --prod + - ls artifacts: paths: - - target/*.jar + - dist/ + publish-job: # Building docker image and publishing it image: docker:latest @@ -39,8 +54,8 @@ publish-job: # Building docker image and publishing it services: - docker:dind script: - - docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW - - docker build -t $DOCKER_URL/$TAG_LATEST . + - docker login -u $DOCKER_USER -p $DOCKER_PW $DOCKER_URL + - docker build -t $DOCKER_URL/$TAG_LATEST --cache-from $DOCKER_URL/$TAG_LATEST . - docker push $DOCKER_URL/$TAG_LATEST 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 push $DOCKER_URL/$TAG_LATEST" - 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"