Merge branch 'master' into #273

Author: Frieda-Hentschel

.azure/pipelines/Phonebook.preview.yml

@@ -6,7 +6,8 @@ pr:
 variables:
   image_repo: tsystemsmms
   image_namespace: phonebook-build
-  image_tag: pr-$(System.PullRequest.PullRequestNumber)
+  image_tag_frontend: pr-$(System.PullRequest.PullRequestNumber)
+  image_tag_source_peoplesoft: pr-$(System.PullRequest.PullRequestNumber)-peoplesoft
   helm_artifact_name: HelmPhonebookPackage
 
 jobs:
@@ -19,23 +20,46 @@ jobs:
         inputs:
           version: '12.x'
 
-      - script: node version.js $(image_tag) $(Build.SourceVersion) $(Build.SourceVersion)
+      - script: node version.js $(image_tag_frontend) $(Build.SourceVersion) $(Build.SourceVersion)
         displayName: 'Write Version Number'
         workingDirectory: 'Phonebook.Frontend/'
 
-      - script: docker build -t $(image_repo)/$(image_namespace):$(image_tag) .
+      - script: docker build -t $(image_repo)/$(image_namespace):$(image_tag_frontend) .
         displayName: 'Build Image'
         workingDirectory: 'Phonebook.Frontend/'
 
       - script: |
           docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD
-          docker push $(image_repo)/$(image_namespace):$(image_tag)
+          docker push $(image_repo)/$(image_namespace):$(image_tag_frontend)
         workingDirectory: 'Phonebook.Frontend/'
         displayName: 'Push Image'
         env:
           DOCKER_REGISTRY_PASSWORD: $(DOCKER_REGISTRY_PASSWORD)
           DOCKER_REGISTRY_USER: $(DOCKER_REGISTRY_USER)
 
+  - job: build_phonebook_source_peoplesoft
+    displayName: 'Phonebook Source Peoplesoft'
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+      - task: UseNode@1
+        inputs:
+          version: '12.x'
+
+
+      - script: docker build -t $(image_repo)/$(image_namespace):$(image_tag_source_peoplesoft) .
+        displayName: 'Build Image'
+        workingDirectory: 'Phonebook.Source.PeopleSoft/'
+
+      - script: |
+          docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD
+          docker push $(image_repo)/$(image_namespace):$(image_tag_source_peoplesoft)
+        workingDirectory: 'Phonebook.Source.PeopleSoft/'
+        displayName: 'Push Image'
+        env:
+          DOCKER_REGISTRY_PASSWORD: $(DOCKER_REGISTRY_PASSWORD)
+          DOCKER_REGISTRY_USER: $(DOCKER_REGISTRY_USER)
+
   - job: build_phonebook_helm
     displayName: Phonebook Helm Chart
     pool:
@@ -63,7 +87,7 @@ jobs:
     pool:
       vmImage: 'ubuntu-16.04'
     variables:
-      namespace: $(image_tag)
+      namespace: $(image_tag_frontend)
     steps:
       - download: current
         artifact: $(helm_artifact_name)
@@ -98,7 +122,7 @@ jobs:
           chartType: FilePath
           chartPath: '$(Pipeline.Workspace)/$(helm_artifact_name)/phonebook-0.1.0.tgz'
           releaseName: phonebook-$(namespace)
-          overrideValues: 'frontend.image.tag=$(image_tag),frontend.image.repository=$(image_repo),frontend.image.name=$(image_namespace),traefik.enabled=false,host=$(image_tag).demo-phonebook.me'
+          overrideValues: 'frontend.image.tag=$(image_tag_frontend),frontend.image.repository=$(image_repo),frontend.image.name=$(image_namespace),source.peoplesoft.image.tag=$(image_tag_source_peoplesoft),source.peoplesoft.image.name=$(image_namespace),traefik.enabled=false,host=$(image_tag_frontend).demo-phonebook.me'
           valueFile: 'demo/values.yml'
           recreate: true
           tillerNamespace: kube-system
@@ -128,7 +152,7 @@ jobs:
             }
           body: |
             {
-              "body": "Preview Environment ready at https://$(image_tag).demo-phonebook.me"
+              "body": "Preview Environment ready at https://$(image_tag_frontend).demo-phonebook.me"
             }
           urlSuffix: 'repos/T-Systems-MMS/phonebook/issues/$(System.PullRequest.PullRequestNumber)/comments'
           waitForCompletion: 'false'
@@ -153,7 +177,7 @@ jobs:
     pool:
       vmImage: 'ubuntu-16.04'
     variables:
-      namespace: $(image_tag)
+      namespace: $(image_tag_frontend)
     steps:
       - checkout: none
       - task: HelmInstaller@1

.azure/pipelines/production/Phonebook.Source.PeopleSoft.yml

@@ -5,7 +5,7 @@ trigger:
       - master
   paths:
     include:
-      - Phonebook.Source.PeopleSoft/
+      - Phonebook.Source.PeopleSoft/*
 pr: none
 
 jobs:
@@ -15,12 +15,13 @@ jobs:
       vmImage: 'ubuntu-16.04'
     steps:
       - bash: |
-          docker build -t $dockerRepo:$tag .
+          docker build -t $dockerRepo:$tag -t $dockerRepo:latest  .
           docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD
           docker push $dockerRepo:$tag
+          docker push $dockerRepo:latest
         workingDirectory: 'Phonebook.Source.PeopleSoft/'
         env:
           DOCKER_REGISTRY_PASSWORD: $(DOCKER_REGISTRY_PASSWORD)
           DOCKER_REGISTRY_USER: $(DOCKER_REGISTRY_USER)
           dockerRepo: tsystemsmms/phonebook-source-peoplesoft
-          tag: latest
+          tag: $(Build.BuildId)

Phonebook.Frontend/Dockerfile

@@ -1,5 +1,5 @@
 # base image
-FROM node:13.13@sha256:a2f412a0a9af605d1f11bd2bda8c8b76dddc1e5bf648657a896485d3e926dd5f as builder
+FROM node:13.14@sha256:ca5a05fb52581aa6c5ed33b55e0955acda83b4d0322c664e5ca260d569772a27 as builder
 
 # set working directory
 RUN  mkdir /usr/local/app

Phonebook.Frontend/dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:13.13@sha256:a2f412a0a9af605d1f11bd2bda8c8b76dddc1e5bf648657a896485d3e926dd5f
+FROM node:13.14@sha256:ca5a05fb52581aa6c5ed33b55e0955acda83b4d0322c664e5ca260d569772a27
 
 # install chrome for protractor tests
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -