diff --git a/uaa-server/Dockerfile b/uaa-server/Dockerfile index f8d3fab..2308b44 100644 --- a/uaa-server/Dockerfile +++ b/uaa-server/Dockerfile @@ -2,9 +2,9 @@ # UAA Server Build # ----------------------------------------------------------------------------- -FROM cloudfoundry/uaa:77.20.0 +FROM cfidentity/uaa:v78.3.0 COPY uaa.yml /uaa/uaa.yml COPY log4j2.properties /uaa/log4j2.properties ENV CLOUDFOUNDRY_CONFIG_PATH=/uaa -ENV SPRING_PROFILES=hsql,default +ENV SPRING_CONFIG_ACTIVATE_ON-PROFILE=hsql,default EXPOSE 8080 diff --git a/uaa-server/log4j2.properties b/uaa-server/log4j2.properties index 2e22eaa..d62f042 100644 --- a/uaa-server/log4j2.properties +++ b/uaa-server/log4j2.properties @@ -2,21 +2,23 @@ status = error dest = err name = UaaLog -property.log_pattern=[%d{yyyy-MM-dd'T'HH:mm:ss.nnnnnn}{GMT+0}Z] uaa%X{context} - %pid [%t] .... %5p --- %c{1}: %replace{%m}{(?<=password=|client_secret=)([^&]*)}{}%n +property.LOG_EXCEPTION_CONVERSION_WORD=%xwEx +property.LOG_LEVEL_PATTERN=%5p +property.LOG_DATEFORMAT_PATTERN=yyyy-MM-dd'T'HH:mm:ss.SSSXXX +property.APPLICATION_NAME=CF-UAA +property.log_pattern=%clr{%d{${sys:LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${sys:LOG_LEVEL_PATTERN}} %clr{%pid}{magenta} %clr{--- [%15.15t] ${sys:LOG_CORRELATION_PATTERN:-}}{faint}%clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD} -appender.uaaDefaultAppender.type = File +appender.uaaDefaultAppender.type = Console appender.uaaDefaultAppender.name = UaaDefaultAppender -appender.uaaDefaultAppender.fileName = logs/uaa.log appender.uaaDefaultAppender.layout.type = PatternLayout appender.uaaDefaultAppender.layout.pattern = ${log_pattern} -appender.uaaAuditAppender.type = File +appender.uaaAuditAppender.type = Console appender.uaaAuditAppender.name = UaaAuditAppender -appender.uaaAuditAppender.fileName = logs/uaa_events.log appender.uaaAuditAppender.layout.type = PatternLayout appender.uaaAuditAppender.layout.pattern = ${log_pattern} -rootLogger.level = debug +rootLogger.level = info rootLogger.appenderRef.uaaDefaultAppender.ref = UaaDefaultAppender logger.UAAAudit.name = UAA.Audit diff --git a/uaa-server/metadata/ADDITIONAL_TAGS b/uaa-server/metadata/ADDITIONAL_TAGS index 7fb4c72..022d032 100644 --- a/uaa-server/metadata/ADDITIONAL_TAGS +++ b/uaa-server/metadata/ADDITIONAL_TAGS @@ -1 +1 @@ --t uaa-server:77.20 -t uaa-server:77 +-t uaa-server:78.3 -t uaa-server:78 -t uaa-server:latest diff --git a/uaa-server/metadata/IMAGE_VERSION b/uaa-server/metadata/IMAGE_VERSION index 09d9d34..2617fcb 100644 --- a/uaa-server/metadata/IMAGE_VERSION +++ b/uaa-server/metadata/IMAGE_VERSION @@ -1 +1 @@ -77.20.0 +78.3.0 diff --git a/uaa-server/uaa.yml b/uaa-server/uaa.yml index 4e7e3e1..35b80fe 100644 --- a/uaa-server/uaa.yml +++ b/uaa-server/uaa.yml @@ -115,6 +115,7 @@ secret: server_secret steeltoesamplesclient: app-launch-url: https://localhost:7072 + authorities: uaa.resource authorized-grant-types: authorization_code, client_credentials autoapprove: - openid