Skip to content

Commit 43cf0b9

Browse files
committed
Allow spaces in the WLS installer zip name
1 parent 44a1ada commit 43cf0b9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ RUN mkdir -p {{{oracle_home}}} \
2121
&& chown {{userid}}:{{groupid}} {{orainv_dir}} \
2222
&& chown {{userid}}:{{groupid}} {{{oracle_home}}}
2323

24-
{{#installJava}}COPY --from=jdk_build --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
24+
{{#installJava}}COPY --from=jdk_build --chown={{userid}}:{{groupid}} ["{{{java_home}}}", "{{{java_home}}}/"]
2525
{{/installJava}}
2626

27-
{{#installPackages}}COPY --chown={{userid}}:{{groupid}} {{installerFilename}} {{responseFile.name}} {{{tempDir}}}/{{{type}}}/
27+
{{#installPackages}}COPY --chown={{userid}}:{{groupid}} ["{{installerFilename}}", "{{responseFile.name}}", "{{{tempDir}}}/{{{type}}}/"]
2828
{{/installPackages}}
2929
COPY --chown={{userid}}:{{groupid}} oraInst.loc {{inv_loc}}/
3030

@@ -38,7 +38,7 @@ RUN echo "INSTALLING MIDDLEWARE" \
3838
{{#installPackages}}
3939
&& echo "INSTALLING {{type}}" \
4040
# If installer is packaged in a ZIP, extract it before running it
41-
{{#isZip}}&& unzip -q {{{tempDir}}}/{{{type}}}/{{installerFilename}} -d {{{tempDir}}}/{{{type}}} {{/isZip}} \
41+
{{#isZip}}&& unzip -q "{{{tempDir}}}/{{{type}}}/{{installerFilename}}" -d {{{tempDir}}}/{{{type}}} {{/isZip}} \
4242
{{#preinstallCommands}}&& {{{tempDir}}}/{{{type}}}/{{{.}}} {{/preinstallCommands}} \
4343
# IF the installer is a JAR file (not a .bin), run the silent install using Java
4444
{{^isBin}} && {{{java_home}}}/bin/java -Xmx1024m -jar {{{tempDir}}}/{{{type}}}/{{jarName}} \

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
<plugin>
282282
<groupId>org.sonarsource.scanner.maven</groupId>
283283
<artifactId>sonar-maven-plugin</artifactId>
284-
<version>4.0.0.4121</version>
284+
<version>5.0.0.4389</version>
285285
</plugin>
286286
<plugin>
287287
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)