Skip to content

revert ubuntu based images back to single stage #523

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

Merged
mbroz2 merged 4 commits into from
Jul 21, 2023
Merged

revert ubuntu based images back to single stage #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91608e6
revert ubuntu based images back to single stage
mbroz2 Jul 21, 2023
abd6099
add fix back in for REPOSITORIES_PROPERTIES
mbroz2 Jul 21, 2023
59d9ef5
fix 23.0.0.6 full FROMs
mbroz2 Jul 21, 2023
87b8f1b
install/update openssl for ubuntu images
mbroz2 Jul 21, 2023
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
23 changes: 7 additions & 16 deletions ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava AS installBundle
FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava

USER root

@tjwatson tjwatson Jul 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How did this work before without USER root?

@mbroz2 mbroz2 Jul 21, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think that's a question for @leochr, and whether we need it for all the full images, including java8

@leochr leochr Jul 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

USER root shouldn't be used, especially with single-stage Dockerfile as that'll switch the default user of Liberty full image. I believe it was added as part of multi-stage Dockerfiles changes, but I don't think it's needed to perform the operations in the full image.


ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# If there is a local copy of the repository use that instead
COPY resources/ /tmp/

# Install the base bundle
Comment thread
mbroz2 marked this conversation as resolved.
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
installUtility install --acceptLicense baseBundle; \
fi; \
installUtility install --acceptLicense baseBundle; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
rm /opt/ibm/wlp/etc/repositories.properties; \
elif [ -f /tmp/wlpRepo.zip ]; then \
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
else \
installUtility install --acceptLicense baseBundle; \
fi; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava
ARG VERBOSE=false

# Copy the runtime
COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
&& find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

19 changes: 4 additions & 15 deletions ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,26 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM websphere-liberty:23.0.0.6-kernel-java11-openj9 AS installBundle
FROM websphere-liberty:23.0.0.6-kernel-java11-openj9

USER root

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# If there is a local copy of the repository use that instead
COPY resources/ /tmp/

# Install the base bundle
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
installUtility install --acceptLicense baseBundle; \
fi; \
installUtility install --acceptLicense baseBundle; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
rm /opt/ibm/wlp/etc/repositories.properties; \
elif [ -f /tmp/wlpRepo.zip ]; then \
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
else \
installUtility install --acceptLicense baseBundle; \
fi; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

FROM websphere-liberty:23.0.0.6-kernel-java11-openj9
ARG VERBOSE=false

# Copy the runtime
COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
Expand Down
19 changes: 4 additions & 15 deletions ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,26 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM websphere-liberty:23.0.0.6-kernel-java17-openj9 AS installBundle
FROM websphere-liberty:23.0.0.6-kernel-java17-openj9

USER root

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# If there is a local copy of the repository use that instead
COPY resources/ /tmp/

# Install the base bundle
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
installUtility install --acceptLicense baseBundle; \
fi; \
installUtility install --acceptLicense baseBundle; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
rm /opt/ibm/wlp/etc/repositories.properties; \
elif [ -f /tmp/wlpRepo.zip ]; then \
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
else \
installUtility install --acceptLicense baseBundle; \
fi; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

FROM websphere-liberty:23.0.0.6-kernel-java17-openj9
ARG VERBOSE=false

# Copy the runtime
COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
Expand Down
55 changes: 18 additions & 37 deletions ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ibmjava:8-jre AS getRuntime

USER root

ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=23.0.0.6
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""

# If there is a local copy of the image use that instead
COPY resources/ /tmp/

RUN apt-get update \
&& apt-get install -y --no-install-recommends unzip wget openssl \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /licenses/ \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
&& chown -R 1001:0 /opt/ibm/wlp \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM ibmjava:8-jre

USER root
Expand Down Expand Up @@ -95,20 +69,27 @@ RUN set -eux; \
curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \
echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
chmod +x /usr/bin/dumb-init; \
apt-get purge --auto-remove -y wget; \
apt-get purge --auto-remove -y curl; \
Comment thread
mbroz2 marked this conversation as resolved.
rm -rf /var/lib/apt/lists/*;

# Add default user 1001 and create wlp with right user/permissions before copying
RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& mkdir -p /opt/ibm/wlp \
&& chown -R 1001:0 /opt/ibm/wlp \
&& chmod -R g+rw /opt/ibm/wlp

# Copy the runtime and licenses
COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
COPY --from=getRuntime /licenses /licenses
# Install WebSphere Liberty
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""

RUN apt-get install -y --no-install-recommends openssl \
RUN apt-get update \
&& apt-get install -y --no-install-recommends unzip wget openssl \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /licenses/ \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \
&& wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
&& rm /tmp/wlp.zip \
&& chown -R 1001:0 /opt/ibm/wlp \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
&& apt-get purge --auto-remove -y unzip \
&& apt-get purge --auto-remove -y wget \
&& rm -rf /var/lib/apt/lists/*

# Set Path Shortcuts
Expand Down
52 changes: 16 additions & 36 deletions ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ibm-semeru-runtimes:open-11-jre-focal AS getRuntime

USER root

ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=23.0.0.6
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""

# If there is a local copy of the image use that instead
COPY resources/ /tmp/

RUN apt-get update \
&& apt-get install -y --no-install-recommends unzip wget openssl \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /licenses/ \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
&& chown -R 1001:0 /opt/ibm/wlp \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM ibm-semeru-runtimes:open-11-jre-focal

USER root
Expand Down Expand Up @@ -94,17 +68,23 @@ RUN set -eux; \
echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
chmod +x /usr/bin/dumb-init;

# Add default user 1001 and create wlp with right user/permissions before copying
RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& mkdir -p /opt/ibm/wlp \
# Install WebSphere Liberty
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
RUN apt-get update \
&& apt-get install -y --no-install-recommends unzip openssl wget \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /licenses/ \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \
&& wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
&& rm /tmp/wlp.zip \
&& chown -R 1001:0 /opt/ibm/wlp \
&& chmod -R g+rw /opt/ibm/wlp

# Copy the runtime and licenses
COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
COPY --from=getRuntime /licenses /licenses

RUN apt-get install -y --no-install-recommends openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
&& apt-get purge --auto-remove -y unzip \
&& apt-get purge --auto-remove -y wget \
&& rm -rf /var/lib/apt/lists/*

# Set Path Shortcuts
Expand Down
52 changes: 16 additions & 36 deletions ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ibm-semeru-runtimes:open-17-jre-focal AS getRuntime

USER root

ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=23.0.0.6
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""

# If there is a local copy of the image use that instead
COPY resources/ /tmp/

RUN apt-get update \
&& apt-get install -y --no-install-recommends unzip wget openssl \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /licenses/ \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
&& chown -R 1001:0 /opt/ibm/wlp \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM ibm-semeru-runtimes:open-17-jre-focal

USER root
Expand Down Expand Up @@ -94,17 +68,23 @@ RUN set -eux; \
echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
chmod +x /usr/bin/dumb-init;

# Add default user 1001 and create wlp with right user/permissions before copying
RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& mkdir -p /opt/ibm/wlp \
# Install WebSphere Liberty
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
RUN apt-get update \
&& apt-get install -y --no-install-recommends unzip openssl wget \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /licenses/ \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \
&& wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
&& rm /tmp/wlp.zip \
&& chown -R 1001:0 /opt/ibm/wlp \
&& chmod -R g+rw /opt/ibm/wlp

# Copy the runtime and licenses
COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
COPY --from=getRuntime /licenses /licenses

RUN apt-get install -y --no-install-recommends openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
&& apt-get purge --auto-remove -y unzip \
&& apt-get purge --auto-remove -y wget \
&& rm -rf /var/lib/apt/lists/*

# Set Path Shortcuts
Expand Down
23 changes: 7 additions & 16 deletions ga/latest/full/Dockerfile.ubuntu.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM websphere-liberty:kernel AS installBundle
FROM websphere-liberty:kernel-java8-ibmjava

USER root

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# If there is a local copy of the repository use that instead
COPY resources/ /tmp/

# Install the base bundle
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
installUtility install --acceptLicense baseBundle; \
fi; \
installUtility install --acceptLicense baseBundle; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
rm /opt/ibm/wlp/etc/repositories.properties; \
elif [ -f /tmp/wlpRepo.zip ]; then \
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
else \
installUtility install --acceptLicense baseBundle; \
fi; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

FROM websphere-liberty:kernel
ARG VERBOSE=false

# Copy the runtime
COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
&& find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

Loading