Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

work area isn't removed from the image #232

Closed
wants to merge 2 commits into from
Closed

work area isn't removed from the image #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cac209
use the correct path when removing the workarea
idlewis Dec 11, 2020
2642b3a
Remove the workarea directory after SCC population
idlewis Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea

# Create symlinks && set permissions for non-root user
RUN mkdir /logs \
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea

# Create symlinks && set permissions for non-root user
RUN mkdir /logs \
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/beta/helpers/build/populate_scc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ done
# restore umask
umask ${OLD_UMASK}

rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /output/workarea
rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache /output/workarea
Copy link
Member

@leochr leochr Dec 18, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ymanton comment on line 104 states "Server start/stop to populate the /output/workarea and make subsequent server starts faster.", so wondering if removing /output/workarea would affect server startup time?

@idlewis Some comparison runs of sample apps with and without this change (like in this PR for startup time) would help to be certain.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment predates my involvement so I don't know exactly what it's referring to, but I already confirmed with @idlewis that removing this directory shouldn't affect the SCC.


if [[ -d "/output/resources" ]]
then
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/full/Dockerfile.ubi.adoptopenjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea

# Create symlinks && set permissions for non-root user
RUN mkdir /logs \
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/full/Dockerfile.ubi.adoptopenjdk15
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea

# Create symlinks && set permissions for non-root user
RUN mkdir /logs \
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/full/Dockerfile.ubi.adoptopenjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea

# Create symlinks && set permissions for non-root user
RUN mkdir /logs \
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/full/Dockerfile.ubi.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea

# Create symlinks && set permissions for non-root user
RUN mkdir /logs \
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/full/Dockerfile.ubuntu.adoptopenjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea

# Create symlinks && set permissions for non-root user
RUN mkdir /logs \
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea

# Create symlinks && set permissions for non-root user
RUN mkdir /logs \
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/full/helpers/build/populate_scc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ done
# restore umask
umask ${OLD_UMASK}

rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /output/workarea
rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache /output/workarea

if [[ -d "/output/resources" ]]
then
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea


# Create symlinks && set permissions for non-root user
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk15
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea


# Create symlinks && set permissions for non-root user
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/kernel-slim/Dockerfile.ubi.adoptopenjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea


# Create symlinks && set permissions for non-root user
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea


# Create symlinks && set permissions for non-root user
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea


# Create symlinks && set permissions for non-root user
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $WLP_OUTPUT_DIR/defaultServer/workarea


# Create symlinks && set permissions for non-root user
Expand Down
2 changes: 1 addition & 1 deletion releases/latest/kernel-slim/helpers/build/populate_scc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ done
# restore umask
umask ${OLD_UMASK}

rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /output/workarea
rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache /output/workarea

if [[ -d "/output/resources" ]]
then
Expand Down