Skip to content

Merge main into vNext #535

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
tjwatson merged 25 commits into from
Aug 9, 2023
Merged

Merge main into vNext #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e18244a
Merge pull request #515 from WASdev/vNext
wraschke Jun 30, 2023
25106db
Merge pull request #516 from WASdev/vNext
wraschke Jun 30, 2023
ce886b3
revert the FROM statement back to ibmjava:8-ubi (#517)
mbroz2 Jul 6, 2023
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
172e14e
Fail if server cannot start when populating SCC (#522)
ymanton Jul 21, 2023
87b8f1b
install/update openssl for ubuntu images
mbroz2 Jul 21, 2023
d34dff4
Merge pull request #523 from WASdev/singleStage
mbroz2 Jul 21, 2023
6dd8b6c
Remove root user from full images and use chown when copying files (#…
leochr Jul 21, 2023
1dad206
Update from focal to jammy (#521)
idlewis Jul 24, 2023
f36cfad
Change /liberty symlink from /opt/ibm to /opt/ibm/wlp (#525)
leochr Jul 24, 2023
23743f4
Updates for the release of 23.0.0.7
wraschke Jul 11, 2023
ed85559
Image names need correction
wraschke Jul 12, 2023
d561846
Update Travis YML file for record keeping
wraschke Jul 17, 2023
8438785
Required resources directory
wraschke Jul 18, 2023
26fc7eb
23.0.0.7 Ubuntu Dockerfiles must be single stage
wraschke Jul 25, 2023
4d89ef0
Remove unnecessary new lines
wraschke Jul 25, 2023
2aa3adf
Updates from PRs 522, 524, and 525
wraschke Jul 25, 2023
3b034d8
Unnecessary whitespace at end of line
wraschke Jul 25, 2023
0d46a62
Merge pull request #526 from wraschke/vNext_to_main
wraschke Jul 26, 2023
e0ba7f7
Switch back to focal (#528)
leochr Jul 27, 2023
a6cad84
Switch Ubuntu based images for 23.0.0.7 and above to jammy (22.04)
leochr Jul 28, 2023
817fa82
Merge pull request #530 from WASdev/switchToJammy
wraschke Jul 28, 2023
2f43735
Merge branch 'main' into vNext
tjwatson Aug 9, 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
6 changes: 4 additions & 2 deletions ga/23.0.0.3/kernel/helpers/build/populate_scc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ if [ $TRIM_SCC == yes ]
then
echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE."
# Populate the newly created class cache layer.
/opt/ibm/wlp/bin/server start && /opt/ibm/wlp/bin/server stop
/opt/ibm/wlp/bin/server start
/opt/ibm/wlp/bin/server stop
# Find out how full it is.
FULL=`( java $PRINT_LAYER_STATS || true ) 2>&1 | awk '/^Cache is [0-9.]*% .*full/ {print substr($3, 1, length($3)-1)}'`
echo "SCC layer is $FULL% full. Destroying layer."
Expand All @@ -120,7 +121,8 @@ fi
# Server start/stop to populate the /output/workarea and make subsequent server starts faster.
for ((i=0; i<$ITERATIONS; i++))
do
/opt/ibm/wlp/bin/server start && /opt/ibm/wlp/bin/server stop
/opt/ibm/wlp/bin/server start
/opt/ibm/wlp/bin/server stop
done

# restore umask
Expand Down
4 changes: 1 addition & 3 deletions ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java8-ibmjava-ubi
FROM $PARENT_IMAGE AS installBundle

USER root

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

Expand All @@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
ARG VERBOSE=false

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

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

Expand Down
4 changes: 1 addition & 3 deletions ga/23.0.0.6/full/Dockerfile.ubi.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java11-openj9-ubi
FROM $PARENT_IMAGE AS installBundle

USER root

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

Expand All @@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
ARG VERBOSE=false

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

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

Expand Down
4 changes: 1 addition & 3 deletions ga/23.0.0.6/full/Dockerfile.ubi.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java17-openj9-ubi
FROM $PARENT_IMAGE AS installBundle

USER root

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

Expand All @@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
ARG VERBOSE=false

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

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

Expand Down
4 changes: 1 addition & 3 deletions ga/23.0.0.6/full/Dockerfile.ubi.openjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java8-openj9-ubi
FROM $PARENT_IMAGE AS installBundle

USER root

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

Expand All @@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
ARG VERBOSE=false

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

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

Expand Down
21 changes: 5 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,27 @@
# 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

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-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

21 changes: 4 additions & 17 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,24 @@
# 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

USER root
FROM websphere-liberty:23.0.0.6-kernel-java11-openj9

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
21 changes: 4 additions & 17 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,24 @@
# 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

USER root
FROM websphere-liberty:23.0.0.6-kernel-java17-openj9

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; \
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
Loading