[syncope] branch master updated: [SYNCOPE-1585] Fix keystore for Docker

[il...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new c736cde  [SYNCOPE-1585] Fix keystore for Docker
c736cde is described below

commit c736cde1cec71038dd70bd5275e9102dc5f78f97
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Aug 18 17:33:53 2020 +0200

    [SYNCOPE-1585] Fix keystore for Docker
---
 docker/core/pom.xml                       | 2 +-
 docker/core/src/main/resources/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/core/pom.xml b/docker/core/pom.xml
index 3cddab0..a319e7b 100644
--- a/docker/core/pom.xml
+++ b/docker/core/pom.xml
@@ -326,7 +326,7 @@ under the License.
       <resource>
         <directory>${basedir}/../../fit/core-reference/src/test/resources</directory>
         <includes>
-          <include>keystore</include>
+          <include>saml.keystore.jks</include>
         </includes>
         <filtering>false</filtering>
       </resource>
diff --git a/docker/core/src/main/resources/Dockerfile b/docker/core/src/main/resources/Dockerfile
index 99da581..0a26616 100644
--- a/docker/core/src/main/resources/Dockerfile
+++ b/docker/core/src/main/resources/Dockerfile
@@ -31,7 +31,7 @@ RUN mkdir /opt/syncope/log
 
 COPY *.properties* /opt/syncope/conf/
 COPY *.xml* /opt/syncope/conf/
-COPY keystore /opt/syncope/conf/
+COPY saml.keystore.jks /opt/syncope/conf/
 COPY domains/* /opt/syncope/conf/domains/
 
 COPY bundles/*.jar /opt/syncope/bundles/