Skip to content

Commit b5407a0

Browse files
authored
Add uaa.resource authority to steeltoesamplesclient, major UAA bump (#47)
* Add uaa.resource authority to steeltoesamplesclient, major UAA bump * Fresh copy of log4j2.properties * Update ADDITIONAL_TAGS to also publish `latest` for UAA
1 parent bfc829c commit b5407a0

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

uaa-server/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# UAA Server Build
33
# -----------------------------------------------------------------------------
44

5-
FROM cloudfoundry/uaa:77.20.0
5+
FROM cfidentity/uaa:v78.3.0
66
COPY uaa.yml /uaa/uaa.yml
77
COPY log4j2.properties /uaa/log4j2.properties
88
ENV CLOUDFOUNDRY_CONFIG_PATH=/uaa
9-
ENV SPRING_PROFILES=hsql,default
9+
ENV SPRING_CONFIG_ACTIVATE_ON-PROFILE=hsql,default
1010
EXPOSE 8080

uaa-server/log4j2.properties

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,23 @@ status = error
22
dest = err
33
name = UaaLog
44

5-
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
5+
property.LOG_EXCEPTION_CONVERSION_WORD=%xwEx
6+
property.LOG_LEVEL_PATTERN=%5p
7+
property.LOG_DATEFORMAT_PATTERN=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
8+
property.APPLICATION_NAME=CF-UAA
9+
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}
610

7-
appender.uaaDefaultAppender.type = File
11+
appender.uaaDefaultAppender.type = Console
812
appender.uaaDefaultAppender.name = UaaDefaultAppender
9-
appender.uaaDefaultAppender.fileName = logs/uaa.log
1013
appender.uaaDefaultAppender.layout.type = PatternLayout
1114
appender.uaaDefaultAppender.layout.pattern = ${log_pattern}
1215

13-
appender.uaaAuditAppender.type = File
16+
appender.uaaAuditAppender.type = Console
1417
appender.uaaAuditAppender.name = UaaAuditAppender
15-
appender.uaaAuditAppender.fileName = logs/uaa_events.log
1618
appender.uaaAuditAppender.layout.type = PatternLayout
1719
appender.uaaAuditAppender.layout.pattern = ${log_pattern}
1820

19-
rootLogger.level = debug
21+
rootLogger.level = info
2022
rootLogger.appenderRef.uaaDefaultAppender.ref = UaaDefaultAppender
2123

2224
logger.UAAAudit.name = UAA.Audit
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-t uaa-server:77.20 -t uaa-server:77
1+
-t uaa-server:78.3 -t uaa-server:78 -t uaa-server:latest

uaa-server/metadata/IMAGE_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
77.20.0
1+
78.3.0

uaa-server/uaa.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
secret: server_secret
116116
steeltoesamplesclient:
117117
app-launch-url: https://localhost:7072
118+
authorities: uaa.resource
118119
authorized-grant-types: authorization_code, client_credentials
119120
autoapprove:
120121
- openid

0 commit comments

Comments
 (0)