Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions uaa-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 8 additions & 6 deletions uaa-server/log4j2.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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=)([^&]*)}{<redacted>}%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
Expand Down
2 changes: 1 addition & 1 deletion uaa-server/metadata/ADDITIONAL_TAGS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-t uaa-server:77.20 -t uaa-server:77
-t uaa-server:78.3 -t uaa-server:78 -t uaa-server:latest
2 changes: 1 addition & 1 deletion uaa-server/metadata/IMAGE_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
77.20.0
78.3.0
1 change: 1 addition & 0 deletions uaa-server/uaa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down