diff --git a/Jenkinsfile b/Jenkinsfile index 883d57f3b..2b0e38a19 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,7 +64,7 @@ pipeline { sed -i -e "s/pc-......./pc-\${IMAGE_TAG}/" deployment.yaml sed -i -e "s/pc-......./pc-\${IMAGE_TAG}/" service.yaml git add * - git commit -m "Update staging file with \${IMAGE_TAG} commit" + git commit -m "Update staging config with \${IMAGE_TAG} commit" git push origin ignite ''' } @@ -82,7 +82,7 @@ pipeline { sed -i -e "s/v[0-9]\\.[0-9]\\.[0-9]/\${IMAGE_TAG}/" deployment.yaml sed -i -e "s/v[0-9]\\.[0-9]\\.[0-9]/\${IMAGE_TAG}/" service.yaml git add * - git commit -m "Update production file with \${IMAGE_TAG} commit" + git commit -m "Update production config with \${IMAGE_TAG} commit" git push origin ignite ''' } diff --git a/infra/kube/workloads/staging/deployment.yaml b/infra/kube/workloads/staging/deployment.yaml index 5c06beb0f..70943dbf4 100644 --- a/infra/kube/workloads/staging/deployment.yaml +++ b/infra/kube/workloads/staging/deployment.yaml @@ -12,12 +12,12 @@ spec: metadata: labels: app: pet-clinic - version: pc-55d6000 + version: pc-1b2914a spec: containers: - name: pet-clinic - image: "jenkinsdemosacr.azurecr.io/pet-clinic:pc-55d6000" + image: "jenkinsdemosacr.azurecr.io/pet-clinic:pc-1b2914a" ports: - containerPort: 8080 imagePullSecrets: diff --git a/infra/kube/workloads/staging/service.yaml b/infra/kube/workloads/staging/service.yaml index 0b4aabdd6..5c2d794df 100644 --- a/infra/kube/workloads/staging/service.yaml +++ b/infra/kube/workloads/staging/service.yaml @@ -4,12 +4,12 @@ metadata: name: pet-clinic namespace: staging labels: - version: pc-55d6000 + version: pc-1b2914a spec: type: LoadBalancer selector: app: pet-clinic - version: pc-55d6000 + version: pc-1b2914a ports: - port: 80 protocol: TCP diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties index 5f13ea1aa..68ef14f31 100644 --- a/src/main/resources/messages/messages.properties +++ b/src/main/resources/messages/messages.properties @@ -1,4 +1,4 @@ -welcome=Welcome to ignite +welcome=Welcome! required=is required notFound=has not been found duplicate=is already in use diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html index 2cd83b671..5a08d4b75 100644 --- a/src/main/resources/templates/welcome.html +++ b/src/main/resources/templates/welcome.html @@ -4,7 +4,7 @@
-