Skip to content

Commit 04d265a

Browse files
ddsharpeddsharpe
authored
Work-around for Docker bug in BuildKit (#240)
1 parent 90f00f9 commit 04d265a

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

‎imagetool/src/main/resources/docker-files/Create_Image.mustache‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
#
66
#
7-
FROM {{baseImage}} as OS_UPDATE
7+
FROM {{baseImage}} as os_update
88
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
99
USER root
1010

@@ -48,7 +48,7 @@ RUN if [ -z "$(getent group {{groupid}})" ]; then hash groupadd &> /dev/null &&
4848

4949
{{#installJava}}
5050
# Install Java
51-
FROM OS_UPDATE as JDK_BUILD
51+
FROM os_update as jdk_build
5252
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
5353

5454
ENV JAVA_HOME={{{java_home}}}
@@ -72,7 +72,7 @@ RUN tar xzf {{{tempDir}}}/{{java_pkg}} -C /u01 \
7272
{{/installJava}}
7373

7474
# Install Middleware
75-
FROM OS_UPDATE as WLS_BUILD
75+
FROM os_update as wls_build
7676
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
7777

7878
ENV JAVA_HOME={{{java_home}}} \
@@ -88,7 +88,7 @@ RUN mkdir -p {{{oracle_home}}} \
8888
&& chown {{userid}}:{{groupid}} {{orainv_dir}} \
8989
&& chown {{userid}}:{{groupid}} {{{oracle_home}}}
9090

91-
{{#installJava}}COPY --from=JDK_BUILD --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
91+
{{#installJava}}COPY --from=jdk_build --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
9292
{{/installJava}}
9393

9494
{{#installPackages}}COPY --chown={{userid}}:{{groupid}} {{installerFilename}} {{responseFile.name}} {{{tempDir}}}/
@@ -146,7 +146,7 @@ RUN cd {{{tempDir}}}/opatch \
146146
{{/afterFmwInstall}}
147147

148148
{{#isWdtEnabled}}
149-
FROM WLS_BUILD as WDT_BUILD
149+
FROM wls_build as wdt_build
150150
ARG WDT_ENCRYPTION_KEY
151151
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
152152

@@ -215,7 +215,7 @@ RUN cd {{{tempDir}}}/opatch \
215215

216216
{{/isWdtEnabled}}
217217

218-
FROM OS_UPDATE as FINAL_BUILD
218+
FROM os_update as final_build
219219

220220
ARG ADMIN_NAME
221221
ARG ADMIN_HOST
@@ -239,15 +239,15 @@ ENV ORACLE_HOME={{{oracle_home}}} \
239239
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
240240

241241
{{#installJava}}
242-
COPY --from=JDK_BUILD --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
242+
COPY --from=jdk_build --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
243243
{{/installJava}}
244244

245-
COPY --from=WLS_BUILD --chown={{userid}}:{{groupid}} {{{oracle_home}}} {{{oracle_home}}}/
245+
COPY --from=wls_build --chown={{userid}}:{{groupid}} {{{oracle_home}}} {{{oracle_home}}}/
246246
{{#copyOraInst}}
247-
COPY --from=WLS_BUILD --chown={{userid}}:{{groupid}} {{inv_loc}}/oraInst.loc {{inv_loc}}/oraInst.loc
247+
COPY --from=wls_build --chown={{userid}}:{{groupid}} {{inv_loc}}/oraInst.loc {{inv_loc}}/oraInst.loc
248248
{{/copyOraInst}}
249249
{{#copyOraInventoryDir}}
250-
COPY --from=WLS_BUILD --chown={{userid}}:{{groupid}} {{orainv_dir}} {{orainv_dir}}/
250+
COPY --from=wls_build --chown={{userid}}:{{groupid}} {{orainv_dir}} {{orainv_dir}}/
251251
{{/copyOraInventoryDir}}
252252

253253
{{#isWdtEnabled}}
@@ -258,13 +258,13 @@ COPY --from=WLS_BUILD --chown={{userid}}:{{groupid}} {{{oracle_home}}} {{{oracle
258258
&& chmod g+w $DOMAIN_PARENT \
259259
&& mkdir -p {{{wdt_model_home}}} \
260260
&& chmod g+w {{{wdt_model_home}}}
261-
COPY --from=WDT_BUILD --chown={{userid}}:{{groupid}} {{wdt_home}} {{wdt_home}}/
261+
COPY --from=wdt_build --chown={{userid}}:{{groupid}} {{wdt_home}} {{wdt_home}}/
262262
{{#isWdtModelHomeOutsideWdtHome}}
263-
COPY --from=WDT_BUILD --chown={{userid}}:{{groupid}} {{wdt_model_home}} {{wdt_model_home}}/
263+
COPY --from=wdt_build --chown={{userid}}:{{groupid}} {{wdt_model_home}} {{wdt_model_home}}/
264264
{{/isWdtModelHomeOutsideWdtHome}}
265265
{{/modelOnly}}
266266
{{^modelOnly}}
267-
COPY --from=WDT_BUILD --chown={{userid}}:{{groupid}} {{{domain_home}}} {{{domain_home}}}/
267+
COPY --from=wdt_build --chown={{userid}}:{{groupid}} {{{domain_home}}} {{{domain_home}}}/
268268
RUN chmod g+w {{{domain_home}}}
269269
{{/modelOnly}}
270270
{{/isWdtEnabled}}

‎imagetool/src/main/resources/docker-files/Rebase_Image.mustache‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#
77

88
{{#isRebaseToTarget}}
9-
FROM {{sourceImage}} as SOURCE_IMAGE
10-
FROM {{targetImage}} as FINAL_BUILD
9+
FROM {{sourceImage}} as source_image
10+
FROM {{targetImage}} as final_build
1111
ARG ADMIN_PORT
1212
ARG MANAGED_SERVER_PORT
1313

@@ -18,8 +18,8 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
1818

1919
{{/isRebaseToTarget}}
2020
{{#isRebaseToNew}}
21-
FROM {{sourceImage}} as SOURCE_IMAGE
22-
FROM {{baseImage}} as OS_UPDATE
21+
FROM {{sourceImage}} as source_image
22+
FROM {{baseImage}} as os_update
2323
ARG ADMIN_PORT
2424
ARG MANAGED_SERVER_PORT
2525

@@ -70,7 +70,7 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
7070

7171
{{#installJava}}
7272
# Install Java
73-
FROM OS_UPDATE as JDK_BUILD
73+
FROM os_update as jdk_build
7474
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
7575

7676
ENV JAVA_HOME={{{java_home}}}
@@ -93,7 +93,7 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
9393
{{/afterJdkInstall}}
9494
{{/installJava}}
9595

96-
FROM OS_UPDATE as WLS_BUILD
96+
FROM os_update as wls_build
9797
# Install middleware
9898
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
9999

@@ -111,7 +111,7 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
111111
&& chown {{userid}}:{{groupid}} {{{oracle_home}}}
112112

113113
{{#installJava}}
114-
COPY --from=JDK_BUILD --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
114+
COPY --from=jdk_build --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
115115
{{/installJava}}
116116

117117
{{#installPackages}}COPY --chown={{userid}}:{{groupid}} {{installerFilename}} {{responseFile.name}} {{{tempDir}}}/
@@ -168,7 +168,7 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
168168
{{/afterFmwInstall}}
169169

170170

171-
FROM OS_UPDATE as FINAL_BUILD
171+
FROM os_update as final_build
172172

173173
ARG ADMIN_NAME
174174
ARG ADMIN_HOST
@@ -184,21 +184,21 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
184184
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
185185

186186
{{#installJava}}
187-
COPY --from=JDK_BUILD --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
187+
COPY --from=jdk_build --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
188188
{{/installJava}}
189189

190-
COPY --from=WLS_BUILD --chown={{userid}}:{{groupid}} {{{oracle_home}}} {{{oracle_home}}}/
190+
COPY --from=wls_build --chown={{userid}}:{{groupid}} {{{oracle_home}}} {{{oracle_home}}}/
191191
{{#copyOraInst}}
192-
COPY --from=WLS_BUILD --chown={{userid}}:{{groupid}} {{inv_loc}}/oraInst.loc {{inv_loc}}/oraInst.loc
192+
COPY --from=wls_build --chown={{userid}}:{{groupid}} {{inv_loc}}/oraInst.loc {{inv_loc}}/oraInst.loc
193193
{{/copyOraInst}}
194194
{{#copyOraInventoryDir}}
195-
COPY --from=WLS_BUILD --chown={{userid}}:{{groupid}} {{orainv_dir}} {{orainv_dir}}/
195+
COPY --from=wls_build --chown={{userid}}:{{groupid}} {{orainv_dir}} {{orainv_dir}}/
196196
{{/copyOraInventoryDir}}
197197
{{/isRebaseToNew}}
198198

199199
USER {{userid}}
200200
RUN mkdir -p {{domain_home}}
201-
COPY --from=SOURCE_IMAGE --chown={{userid}}:{{groupid}} {{domain_home}} {{domain_home}}/
201+
COPY --from=source_image --chown={{userid}}:{{groupid}} {{domain_home}} {{domain_home}}/
202202
RUN chmod g+w {{{domain_home}}}
203203

204204
EXPOSE $ADMIN_PORT $MANAGED_SERVER_PORT

‎imagetool/src/main/resources/docker-files/Update_Image.mustache‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
#
77
{{#isWdtEnabled}}
8-
FROM {{baseImage}} as WDT_BUILD
8+
FROM {{baseImage}} as wdt_build
99
ARG WDT_ENCRYPTION_KEY
1010
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
1111

@@ -79,7 +79,7 @@
7979
{{/afterWdtCommand}}
8080
{{/isWdtEnabled}}
8181

82-
FROM {{baseImage}} as FINAL_BUILD
82+
FROM {{baseImage}} as final_build
8383
USER root
8484

8585
ENV OPATCH_NO_FUSER=true
@@ -133,13 +133,13 @@ USER {{userid}}
133133
&& chmod g+w $DOMAIN_PARENT \
134134
&& mkdir -p {{{wdt_model_home}}} \
135135
&& chmod g+w {{{wdt_model_home}}}
136-
COPY --from=WDT_BUILD --chown={{userid}}:{{groupid}} {{wdt_home}} {{wdt_home}}/
136+
COPY --from=wdt_build --chown={{userid}}:{{groupid}} {{wdt_home}} {{wdt_home}}/
137137
{{#isWdtModelHomeOutsideWdtHome}}
138-
COPY --from=WDT_BUILD --chown={{userid}}:{{groupid}} {{wdt_model_home}} {{wdt_model_home}}/
138+
COPY --from=wdt_build --chown={{userid}}:{{groupid}} {{wdt_model_home}} {{wdt_model_home}}/
139139
{{/isWdtModelHomeOutsideWdtHome}}
140140
{{/modelOnly}}
141141
{{^modelOnly}}
142-
COPY --from=WDT_BUILD --chown={{userid}}:{{groupid}} {{{domain_home}}} {{{domain_home}}}/
142+
COPY --from=wdt_build --chown={{userid}}:{{groupid}} {{{domain_home}}} {{{domain_home}}}/
143143
RUN chmod g+w {{{domain_home}}}
144144
{{/modelOnly}}
145145
{{/isWdtEnabled}}

0 commit comments

Comments
 (0)