Merge branch 'openshift-umask-077' into 'main'

Correct file permissions of MII with OpenShift when base filesystem uses 077 See merge request weblogic-cloud/weblogic-image-tool!463
oracle · Feb 23, 2024 · 21d632b · 21d632b
2 parents 1f30dd2 + 952a1a5
commit 21d632b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/imagetool/src/main/resources/docker-files/Rebase_Image.mustache b/imagetool/src/main/resources/docker-files/Rebase_Image.mustache
@@ -80,7 +80,7 @@ RUN mkdir -p {{domain_home}}
 {{/modelOnly}}
 
 {{#domainGroupAsUser}}
-    RUN chmod g=u {{{domain_home}}}
+    RUN chmod -R g=u {{{domain_home}}}
 {{/domainGroupAsUser}}
 
 WORKDIR {{{work_dir}}}

diff --git a/imagetool/src/main/resources/docker-files/final-wdt-copy.mustache b/imagetool/src/main/resources/docker-files/final-wdt-copy.mustache
@@ -11,12 +11,12 @@
         COPY --from=wdt_build --chown={{userid}}:{{groupid}} {{wdt_model_home}} {{wdt_model_home}}/
     {{/isWdtModelHomeOutsideWdtHome}}
     {{#domainGroupAsUser}}
-        RUN chmod g=u {{{domain_parent}}} {{{wdt_home}}} {{{wdt_model_home}}}
+        RUN chmod -R g=u {{{domain_parent}}} {{{wdt_home}}} {{{wdt_model_home}}}
     {{/domainGroupAsUser}}
 {{/modelOnly}}
 {{^modelOnly}}
     COPY --from=wdt_build --chown={{userid}}:{{groupid}} {{{domain_home}}} {{{domain_home}}}/
     {{#domainGroupAsUser}}
-        RUN chmod g=u {{{domain_home}}}
+        RUN chmod -R g=u {{{domain_home}}}
     {{/domainGroupAsUser}}
 {{/modelOnly}}