From 70569c5275f69b7b2da93559bf2e0b6441533e8c Mon Sep 17 00:00:00 2001 From: ilewis Date: Tue, 12 Jan 2021 10:11:45 -0800 Subject: [PATCH] Remove command to rm non-existent directory --- releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk11 | 2 +- releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk8 | 2 +- releases/latest/full/Dockerfile.ubi.adoptopenjdk11 | 2 +- releases/latest/full/Dockerfile.ubi.adoptopenjdk15 | 2 +- releases/latest/full/Dockerfile.ubi.adoptopenjdk8 | 2 +- releases/latest/full/Dockerfile.ubi.ibmjava8 | 2 +- releases/latest/full/Dockerfile.ubuntu.adoptopenjdk11 | 2 +- releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8 | 2 +- releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk11 | 2 +- releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk15 | 2 +- releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk8 | 2 +- releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 | 2 +- releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11 | 2 +- releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8 | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk11 b/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk11 index 675346b33..5e0499782 100644 --- a/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk11 +++ b/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk11 @@ -49,7 +49,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create --template=javaee8 \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user RUN mkdir /logs \ diff --git a/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk8 b/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk8 index 93affe4fa..575d0d71a 100644 --- a/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk8 +++ b/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk8 @@ -49,7 +49,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create --template=javaee8 \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user RUN mkdir /logs \ diff --git a/releases/latest/full/Dockerfile.ubi.adoptopenjdk11 b/releases/latest/full/Dockerfile.ubi.adoptopenjdk11 index cc8388e39..5d5572365 100644 --- a/releases/latest/full/Dockerfile.ubi.adoptopenjdk11 +++ b/releases/latest/full/Dockerfile.ubi.adoptopenjdk11 @@ -50,7 +50,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create --template=javaee8 \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user RUN mkdir /logs \ diff --git a/releases/latest/full/Dockerfile.ubi.adoptopenjdk15 b/releases/latest/full/Dockerfile.ubi.adoptopenjdk15 index cd53b4c18..b3bbff49e 100644 --- a/releases/latest/full/Dockerfile.ubi.adoptopenjdk15 +++ b/releases/latest/full/Dockerfile.ubi.adoptopenjdk15 @@ -50,7 +50,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create --template=javaee8 \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user RUN mkdir /logs \ diff --git a/releases/latest/full/Dockerfile.ubi.adoptopenjdk8 b/releases/latest/full/Dockerfile.ubi.adoptopenjdk8 index d5d2221d0..6b2535c96 100644 --- a/releases/latest/full/Dockerfile.ubi.adoptopenjdk8 +++ b/releases/latest/full/Dockerfile.ubi.adoptopenjdk8 @@ -50,7 +50,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create --template=javaee8 \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user RUN mkdir /logs \ diff --git a/releases/latest/full/Dockerfile.ubi.ibmjava8 b/releases/latest/full/Dockerfile.ubi.ibmjava8 index 785a0da54..9a8db1b15 100644 --- a/releases/latest/full/Dockerfile.ubi.ibmjava8 +++ b/releases/latest/full/Dockerfile.ubi.ibmjava8 @@ -50,7 +50,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create --template=javaee8 \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user RUN mkdir /logs \ diff --git a/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk11 b/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk11 index cd174f732..c885e1e06 100644 --- a/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk11 +++ b/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk11 @@ -49,7 +49,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create --template=javaee8 \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user RUN mkdir /logs \ diff --git a/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8 b/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8 index d30d805b5..b9c1f8426 100644 --- a/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8 +++ b/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8 @@ -49,7 +49,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create --template=javaee8 \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user RUN mkdir /logs \ diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk11 b/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk11 index 05c764c0e..a17f5a288 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk11 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk11 @@ -50,7 +50,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk15 b/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk15 index 3178a9132..1dcb693b5 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk15 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk15 @@ -50,7 +50,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk8 b/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk8 index 9a50231c9..5872639dc 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk8 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk8 @@ -50,7 +50,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 index 55d95f4d7..c01d87210 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 @@ -50,7 +50,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11 b/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11 index 0edd26520..955a077b7 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11 +++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11 @@ -49,7 +49,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8 b/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8 index 554612204..9949edb40 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8 +++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8 @@ -49,7 +49,7 @@ ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \ # Configure Open Liberty RUN /opt/ol/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea + && rm -rf $WLP_OUTPUT_DIR/.classCache # Create symlinks && set permissions for non-root user