bump UAA and Spring Boot Admin

Author: TimHess

spring-boot-admin/Dockerfile

@@ -9,14 +9,14 @@ WORKDIR /scratch
 RUN apk update && apk add ca-certificates && apk add curl && apk add patch
 RUN curl https://start.spring.io/starter.zip \
         -d type=gradle-project \
-        -d bootVersion=3.4.1 \
+        -d bootVersion=3.4.3 \
         -d javaVersion=$JVM \
         -d groupId=io.steeltoe.docker \
         -d artifactId=springbootadmin \
         -d applicationName=SpringBootAdmin \
         -d language=java \
         -d dependencies=codecentric-spring-boot-admin-server \
-        -d version=3.4.1 \
+        -d version=3.4.3 \
         --output springbootadmin.zip
 RUN mkdir springbootadmin && unzip -d springbootadmin springbootadmin.zip
 COPY metadata metadata

spring-boot-admin/metadata/IMAGE_VERSION

@@ -1 +1 @@
-3.4.1
+3.4.3

uaa-server/Dockerfile

@@ -2,9 +2,9 @@
 # UAA Server Build
 # -----------------------------------------------------------------------------
 
-FROM cloudfoundry/uaa:77.10.0
+FROM cloudfoundry/uaa:77.20.0
 COPY uaa.yml /uaa/uaa.yml
 COPY log4j2.properties /uaa/log4j2.properties
-ENV CLOUDFOUNDRY_CONFIG_PATH /uaa
-ENV SPRING_PROFILES hsql,default
+ENV CLOUDFOUNDRY_CONFIG_PATH=/uaa
+ENV SPRING_PROFILES=hsql,default
 EXPOSE 8080

uaa-server/README.md

@@ -7,7 +7,13 @@ This directory contains resources for building a [CloudFoundry User Account and
 To run this image locally:
 
 ```shell
-docker run -it -p 8080:8080 --name steeltoe-uaa steeltoe.azurecr.io/uaa-server:77.10
+docker run -it -p 8080:8080 --name steeltoe-uaa steeltoe.azurecr.io/uaa-server:77
+```
+
+To run this image locally, overwriting the included `uaa.yml` file:
+
+```shell
+docker run -it -p 8080:8080 --name steeltoe-uaa -v $pwd/uaa.yml:/uaa/uaa.yml steeltoe.azurecr.io/uaa-server:77
 ```
 
 ## Customizing for your Cloud Foundry environment
@@ -21,6 +27,6 @@ These instructions will help you build and deploy a custom image to use as an id
 1. `.\build.ps1 uaa-server`.
 1. Push the image to an image repository accessible from your Cloud Foundry environment.
 1. Deploy the image with a command similar to this:
-   * `cf push steeltoe-uaa --docker-image steeltoe.azurecr.io/uaa-server:77.10`
+   * `cf push steeltoe-uaa --docker-image steeltoe.azurecr.io/uaa-server:77`
 1. (Operator task) [Add the new identity provider with OpenID Connect](https://docs.vmware.com/en/Single-Sign-On-for-VMware-Tanzu-Application-Service/1.14/sso/GUID-configure-external-id.html#config-ext-oidc)
    * Use the `ssotile` credentials from uaa.yml

uaa-server/metadata/ADDITIONAL_TAGS

@@ -1 +1 @@
--t uaa-server:77.10 -t uaa-server:77
+-t uaa-server:77.20 -t uaa-server:77

uaa-server/metadata/IMAGE_VERSION

@@ -1 +1 @@
-77.10.0
+77.20.0