Merge pull request #4150 from pdrozd/KEYCLOAK-4930

KEYCLOAK-4930 - Updated install-keycloak script for overlay installat…
This commit is contained in:
Pavel Drozd 2017-05-23 14:00:35 +02:00 committed by GitHub
commit 12fec09410
3 changed files with 8 additions and 4 deletions

View file

@ -1,7 +1,9 @@
set NOPAUSE=true set NOPAUSE=true
call %JBOSS_HOME%\bin\jboss-cli.bat --file=keycloak-install.cli call %JBOSS_HOME%\bin\jboss-cli.bat --file=keycloak-install.cli
call %JBOSS_HOME%\bin\jboss-cli.bat --file=keycloak-install-ha.cli
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL% if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
exit /b %ERROR% exit /b %ERROR%

View file

@ -10,8 +10,8 @@ cd $JBOSS_HOME/bin
RESULT=0 RESULT=0
./jboss-cli.sh --file=keycloak-install.cli ./jboss-cli.sh --file=keycloak-install.cli
if [ $? -ne 0 ]; then RESULT=1; fi if [ $? -ne 0 ]; then exit 1; fi
exit $RESULT ./jboss-cli.sh --file=keycloak-install-ha.cli
fi if [ $? -ne 0 ]; then exit 1; fi
exit 1 exit 0

View file

@ -100,6 +100,7 @@
<outputDirectory>${project.build.directory}/unpacked</outputDirectory> <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
<excludes>**/product.conf</excludes>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -309,6 +310,7 @@
<artifactId>${auth.server.overlay.artifactId}</artifactId> <artifactId>${auth.server.overlay.artifactId}</artifactId>
<version>${auth.server.overlay.version}</version> <version>${auth.server.overlay.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/unpacked/${overlaid.container.unpacked.folder.name}</outputDirectory> <outputDirectory>${project.build.directory}/unpacked/${overlaid.container.unpacked.folder.name}</outputDirectory>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>