allow base image to have an existing /u01 folder (#231)

oracle · Dec 16, 2020 · 1393331 · 1393331
1 parent 05d16e1
commit 1393331
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/imagetool/src/main/resources/docker-files/Create_Image.mustache b/imagetool/src/main/resources/docker-files/Create_Image.mustache
@@ -42,7 +42,7 @@ RUN zypper -nq update \
 ## Create user and group
 RUN if [ -z "$(getent group {{groupid}})" ]; then hash groupadd &> /dev/null && groupadd {{groupid}} || exit -1 ; fi \
  && if [ -z "$(getent passwd {{userid}})" ]; then hash useradd &> /dev/null && useradd -g {{groupid}} {{userid}} || exit -1; fi \
- && mkdir /u01 \
+ && mkdir -p /u01 \
  && chown {{userid}}:{{groupid}} /u01 \
  && chmod 775 /u01
 

diff --git a/imagetool/src/main/resources/docker-files/Rebase_Image.mustache b/imagetool/src/main/resources/docker-files/Rebase_Image.mustache
@@ -64,7 +64,7 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
     ## Create user and group
     RUN if [ -z "$(getent group {{groupid}})" ]; then hash groupadd &> /dev/null && groupadd {{groupid}} || exit -1 ; fi \
     && if [ -z "$(getent passwd {{userid}})" ]; then hash useradd &> /dev/null && useradd -g {{groupid}} {{userid}} || exit -1; fi \
-    && mkdir /u01 \
+    && mkdir -p /u01 \
     && chown {{userid}}:{{groupid}} /u01 \
     && chmod 775 /u01