Merge pull request #4151 from pdrozd/KEYCLOAK-4931

KEYCLOAK-4931 - install patch available from http
This commit is contained in:
Pavel Drozd 2017-05-23 14:01:44 +02:00 committed by GitHub
commit c230edbf72
4 changed files with 34 additions and 14 deletions

View file

@ -1,9 +1,14 @@
set NOPAUSE=true
setlocal EnableDelayedExpansion
for %%a in ("%APP_PATCH_ZIPS:,=" "%") do (
call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %%~a"
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
)
exit /b %ERROR%
for %%a in (%APP_PATCH_ZIPS%) do (
set patch=%%a
if "!patch:~0,4!"=="http" (
powershell -command "& { iwr %%a -OutFile %cd%\patch.zip }"
call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %cd%\patch.zip
) else (
call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %%a"
)
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
)
exit /b %ERROR%

View file

@ -12,6 +12,11 @@ RESULT=0
patches=$(echo $APP_PATCH_ZIPS | tr "," "\n")
for patch in $patches
do
if [[ $patch == http* ]];
then
wget -O ./patch.zip $patch >/dev/null 2>&1
patch=./patch.zip
fi
./jboss-cli.sh --command="patch apply $patch"
if [ $? -ne 0 ]; then exit 1; fi
done

View file

@ -1,9 +1,14 @@
set NOPAUSE=true
setlocal EnableDelayedExpansion
for %%a in ("%APP_PATCH_ZIPS:,=" "%") do (
call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %%~a"
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
)
exit /b %ERROR%
for %%a in (%AUTH_PATCH_ZIPS%) do (
set patch=%%a
if "!patch:~0,4!"=="http" (
powershell -command "& { iwr %%a -OutFile %cd%\patch.zip }"
call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %cd%\patch.zip
) else (
call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %%a"
)
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
)
exit /b %ERROR%

View file

@ -12,6 +12,11 @@ RESULT=0
patches=$(echo $AUTH_PATCH_ZIPS | tr "," "\n")
for patch in $patches
do
if [[ $patch == http* ]];
then
wget -O ./patch.zip $patch >/dev/null 2>&1
patch=./patch.zip
fi
./jboss-cli.sh --command="patch apply $patch"
if [ $? -ne 0 ]; then exit 1; fi
done