@@ -14,14 +14,8 @@ ARG MANAGED_SERVER_PORT
14
14
ENV ADMIN_PORT=${ ADMIN_PORT} \
15
15
MANAGED_SERVER_PORT=${ MANAGED_SERVER_PORT}
16
16
LABEL com.oracle.weblogic.imagetool.buildid="{ {buildId} }"
17
- USER { {userid} }
18
- RUN mkdir -p { {domain_home} }
19
- COPY --from=SOURCE_IMAGE --chown={ {userid} }:{ {groupid} } { {domain_home} } { {domain_home} }/
20
-
21
17
22
18
{ {/isRebaseToTarget} }
23
-
24
-
25
19
{ {#isRebaseToNew} }
26
20
FROM { {sourceImage} } as SOURCE_IMAGE
27
21
FROM { {baseImage} } as OS_UPDATE
@@ -99,6 +93,8 @@ COPY --from=SOURCE_IMAGE --chown={{userid}}:{{groupid}} {{domain_home}} {{domain
99
93
&& mkdir -p { {inv_loc} } \
100
94
&& chown { {userid} }:{ {groupid} } { {inv_loc} } \
101
95
{ {/isCustomInventoryLoc} }
96
+ && mkdir -p { {orainv_dir} } \
97
+ && chown { {userid} }:{ {groupid} } { {orainv_dir} } \
102
98
&& chown { {userid} }:{ {groupid} } { {{oracle_home} }}
103
99
104
100
{ {#installJava} }
@@ -164,13 +160,18 @@ COPY --from=SOURCE_IMAGE --chown={{userid}}:{{groupid}} {{domain_home}} {{domain
164
160
{ {/installJava} }
165
161
166
162
COPY --from=WLS_BUILD --chown={ {userid} }:{ {groupid} } { {{oracle_home} }} { {{oracle_home} }}/
167
-
168
- USER { {userid} }
169
- RUN mkdir -p { {domain_home} }
170
- COPY --from=SOURCE_IMAGE --chown={ {userid} }:{ {groupid} } { {domain_home} } { {domain_home} }/
171
-
163
+ { {#copyOraInst} }
164
+ COPY --from=WLS_BUILD --chown={ {userid} }:{ {groupid} } { {inv_loc} }/oraInst.loc { {inv_loc} }/oraInst.loc
165
+ { {/copyOraInst} }
166
+ { {#copyOraInventoryDir} }
167
+ COPY --from=WLS_BUILD --chown={ {userid} }:{ {groupid} } { {orainv_dir} } { {orainv_dir} }/
168
+ { {/copyOraInventoryDir} }
172
169
{ {/isRebaseToNew} }
173
170
171
+ USER { {userid} }
172
+ RUN mkdir -p { {domain_home} }
173
+ COPY --from=SOURCE_IMAGE --chown={ {userid} }:{ {groupid} } { {domain_home} } { {domain_home} }/
174
+
174
175
EXPOSE $ADMIN_PORT $MANAGED_SERVER_PORT
175
176
WORKDIR { {{work_dir} }}
176
177
0 commit comments