Skip to content

Commit 8705397

Browse files
authored
Moved beforeWdtCommand hook after installer is extracted and removed unnecessary chmod in validate step (#302)
1 parent 5632965 commit 8705397

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

imagetool/src/main/resources/docker-files/run-wdt.mustache

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ RUN cd {{{wdt_home}}} \
3232
COPY --chown={{userid}}:{{groupid}} {{{.}}} {{{wdt_model_home}}}/
3333
{{/wdtVariables}}
3434

35-
{{#beforeWdtCommand}}
36-
{{{.}}}
37-
{{/beforeWdtCommand}}
38-
3935
RUN test -d {{{wdt_home}}}/weblogic-deploy && rm -rf {{{wdt_home}}}/weblogic-deploy || echo Initial WDT install \
4036
{{#usingWdtTarGzInstaller}}
4137
&& tar zxf {{{tempDir}}}/{{{wdtInstaller}}} -C {{{wdt_home}}}
@@ -44,6 +40,10 @@ RUN test -d {{{wdt_home}}}/weblogic-deploy && rm -rf {{{wdt_home}}}/weblogic-dep
4440
&& unzip -q {{{tempDir}}}/{{{wdtInstaller}}} -d {{{wdt_home}}}
4541
{{/usingWdtTarGzInstaller}}
4642

43+
{{#beforeWdtCommand}}
44+
{{{.}}}
45+
{{/beforeWdtCommand}}
46+
4747
{{^modelOnly}}
4848
RUN cd {{{wdt_home}}}/weblogic-deploy/bin \
4949
&& {{#isWdtUseEncryption}}echo {{{wdtEncryptionKey}}} | {{/isWdtUseEncryption}} ./createDomain.sh \
@@ -62,7 +62,6 @@ RUN test -d {{{wdt_home}}}/weblogic-deploy && rm -rf {{{wdt_home}}}/weblogic-dep
6262
{{#isWdtValidateEnabled}}
6363
RUN cd {{{wdt_home}}}/weblogic-deploy/bin \
6464
&& rm ./*.cmd \
65-
&& chmod ug+x ./*.sh \
6665
&& chmod -R g+w {{{wdt_home}}}/weblogic-deploy/lib \
6766
&& ./validateModel.sh {{^strictValidation}}-method lax{{/strictValidation}} \
6867
-oracle_home {{{oracle_home}}} \

0 commit comments

Comments
 (0)