Skip to content

Commit bef12d8

Browse files
committed
Merge branch 'from-as-case' into 'main'
Keywords FROM and AS should both be uppercase in generated Dockerfiles See merge request weblogic-cloud/weblogic-image-tool!501
2 parents 1625182 + f003b37 commit bef12d8

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
#
44

5-
FROM {{baseImage}} as os_update
5+
FROM {{baseImage}} AS os_update
66
{{#buildArgs}}ARG {{{.}}}
77
{{/buildArgs}}
88
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
@@ -30,7 +30,7 @@ USER root
3030
{{> run-wdt }}
3131
{{/isWdtEnabled}}
3232

33-
FROM os_update as final_build
33+
FROM os_update AS final_build
3434
{{#buildArgs}}ARG {{{.}}}
3535
{{/buildArgs}}
3636
ENV ORACLE_HOME={{{oracle_home}}} \

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#
44

55
{{#isRebaseToTarget}}
6-
FROM {{sourceImage}} as source_image
7-
FROM {{targetImage}} as final_build
6+
FROM {{sourceImage}} AS source_image
7+
FROM {{targetImage}} AS final_build
88
{{#buildArgs}}ARG {{{.}}}
99
{{/buildArgs}}
1010

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

1414
{{/isRebaseToTarget}}
1515
{{#isRebaseToNew}}
16-
FROM {{sourceImage}} as source_image
17-
FROM {{baseImage}} as os_update
16+
FROM {{sourceImage}} AS source_image
17+
FROM {{baseImage}} AS os_update
1818

1919
ENV DOMAIN_HOME={{{domain_home}}}
2020

@@ -39,7 +39,7 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
3939
{{> install-middleware }}
4040
{{/installMiddleware}}
4141

42-
FROM os_update as final_build
42+
FROM os_update AS final_build
4343
{{#buildArgs}}ARG {{{.}}}
4444
{{/buildArgs}}
4545
ENV ORACLE_HOME={{{oracle_home}}} \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{> run-wdt }}
77
{{/isWdtEnabled}}
88

9-
FROM {{baseImage}} as final_build
9+
FROM {{baseImage}} AS final_build
1010
{{#buildArgs}}ARG {{{.}}}
1111
{{/buildArgs}}
1212
USER root

imagetool/src/main/resources/docker-files/aux-image.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# Create Auxiliary Image for WebLogic Kubernetes Operator
77

8-
FROM {{baseImage}} as os_update
8+
FROM {{baseImage}} AS os_update
99
{{#buildArgs}}ARG {{{.}}}
1010
{{/buildArgs}}
1111
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
@@ -20,7 +20,7 @@ USER root
2020
# Create the Oracle user that will be the owner of the installed software
2121
{{> create-user-group}}
2222

23-
FROM os_update as wdt_build
23+
FROM os_update AS wdt_build
2424

2525
RUN mkdir -p {{{wdt_home}}} \
2626
&& mkdir -p {{{wdt_model_home}}} \
@@ -38,7 +38,7 @@ RUN mkdir -p {{{wdt_home}}} \
3838
{{/usingWdtTarGzInstaller}}
3939
{{/installWdt}}
4040

41-
FROM os_update as final
41+
FROM os_update AS final
4242

4343
ENV AUXILIARY_IMAGE_PATH={{{wdt_home}}} \
4444
WDT_HOME={{{wdt_home}}} \

imagetool/src/main/resources/docker-files/install-java.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Installing Java
55

6-
FROM os_update as jdk_build
6+
FROM os_update AS jdk_build
77
{{#buildArgs}}ARG {{{.}}}
88
{{/buildArgs}}
99
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"

imagetool/src/main/resources/docker-files/install-middleware.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Installing Middleware
55

6-
FROM os_update as wls_build
6+
FROM os_update AS wls_build
77
{{#buildArgs}}ARG {{{.}}}
88
{{/buildArgs}}
99
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Create WLS domain (or model)
55

6-
FROM {{{wdtBase}}} as wdt_build
6+
FROM {{{wdtBase}}} AS wdt_build
77
{{#buildArgs}}ARG {{{.}}}
88
{{/buildArgs}}
99
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"

0 commit comments

Comments
 (0)