Merge pull request #8 from docker/1.7.0-RC2

enable beacon in test-compose
docker · Feb 12, 2020 · 88dc057 · 88dc057
2 parents 4494098 + e3a5468
commit 88dc057
Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/containerfiles/supervisord.conf b/containerfiles/supervisord.conf
@@ -6,7 +6,7 @@ nodaemon=true
 user=root
 
 [program:shibui]
-command=/usr/bin/java -Didp.home=/idp-home -jar /opt/shibui/shibui.jar --shibui.user-bootstrap-resource=file:users.txt
+command=/usr/bin/java -Didp.home=/idp-home -jar /opt/shibui/shibui.war --shibui.user-bootstrap-resource=file:users.txt
 directory=/opt/shibui
 autostart=true
 autorestart=true

diff --git a/test-compose/shibui/conf/application.yml b/test-compose/shibui/conf/application.yml
@@ -4,6 +4,7 @@ shibui:
     target: "file:/generated-conf/shibui-metadata-providers.xml"
 
   metadata-dir: "/generated-metadata"
+  beacon-enabled: true
 spring:
   datasource:
     username: shibui
@@ -14,4 +15,4 @@ spring:
   jpa:
     database-platform: org.hibernate.dialect.MariaDBDialect
     hibernate:
-      ddl-auto: update
+      ddl-auto: update