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

v3 Container Fixes #3964

Merged
merged 4 commits into from
Aug 30, 2024
Merged

v3 Container Fixes #3964

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
90f76d2
update v3 containers with newer node and java
MarkAckert Aug 30, 2024
dbeb013
update node gpg keys in ubi
MarkAckert Aug 30, 2024
e42c2b6
update java 11 package for ubi
MarkAckert Aug 30, 2024
f753997
fix java 11 ubi pkg
MarkAckert Aug 30, 2024
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
22 changes: 11 additions & 11 deletions containers/base-jdk/ubi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubi
##################################
# labels
LABEL name="Zowe Base Image with JDK enabled" \
maintainer="jack-tiefeng.jia@ibm.com" \
vendor="Zowe" \
version="2.0.2" \
release="0" \
summary="Base image for Zowe components with JDK enabled" \
description="Base image for Zowe components with JDK enabled"
maintainer="mark.ackert@broadcom.com" \
vendor="Zowe" \
version="3.0.0" \
release="0" \
summary="Base image for Zowe components with JDK enabled" \
description="Base image for Zowe components with JDK enabled"

##################################
# Install JDK
RUN microdnf install --nodocs \
java-1.8.0-openjdk \
&& microdnf clean all --enablerepo='*' \
# smoke tests
&& java -version
ENV JAVA_HOME=/usr/lib/jvm/jre-1.8.0
java-11-openjdk-headless \
&& microdnf clean all --enablerepo='*' \
# smoke tests
&& java -version
ENV JAVA_HOME=/usr/lib/jvm/jre-1.11.0
32 changes: 18 additions & 14 deletions containers/base-jdk/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,23 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubuntu
##################################
# labels
LABEL name="Zowe Base Image with JDK enabled" \
maintainer="jack-tiefeng.jia@ibm.com" \
vendor="Zowe" \
version="2.0.2" \
release="0" \
summary="Base image for Zowe components with JDK enabled" \
description="Base image for Zowe components with JDK enabled"
maintainer="mark.ackert@broadcom.com" \
vendor="Zowe" \
version="3.0.0" \
release="0" \
summary="Base image for Zowe components with JDK enabled" \
description="Base image for Zowe components with JDK enabled"

##################################
# Install JDK
RUN apt-get update \
&& apt-get install -y \
openjdk-8-jre \
&& rm -rf /var/lib/apt/lists/* \
# smoke tests
&& java -version
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre

# Install JDK. We manually add apt sources to avoid installing python, which is required for add-apt-repository.
RUN CODENAME=$(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d "=" -f 2) \
&& echo deb [trusted=yes] https://ppa.launchpadcontent.net/openjdk-r/ppa/ubuntu "$CODENAME" main >> /etc/apt/sources.list \
&& echo deb-src [trusted=yes] https://ppa.launchpadcontent.net/openjdk-r/ppa/ubuntu "$CODENAME" main >> /etc/apt/sources.list \
&& apt-get update \
&& apt-get install -y \
openjdk-11-jre \
&& rm -rf /var/lib/apt/lists/* \
# smoke tests
&& java -version
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/jre
12 changes: 6 additions & 6 deletions containers/base-node/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base:${ZOWE_BASE_IMAGE}
##################################
# labels
LABEL name="Zowe Base Image with node.js enabled" \
maintainer="jack-tiefeng.jia@ibm.com" \
vendor="Zowe" \
version="2.0.2" \
release="0" \
summary="Base image for Zowe components with node.js enabled" \
description="Base image for Zowe components with node.js enabled"
maintainer="mark.ackert@broadcom.com" \
vendor="Zowe" \
version="3.0.0" \
release="0" \
summary="Base image for Zowe components with node.js enabled" \
description="Base image for Zowe components with node.js enabled"

##################################
# node.js is installed in base image, so no actions here
Expand Down
115 changes: 57 additions & 58 deletions containers/base/ubi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ FROM registry.redhat.io/ubi8/ubi-minimal:latest
##################################
# labels
LABEL name="Zowe Base Image" \
maintainer="jack-tiefeng.jia@ibm.com" \
vendor="Zowe" \
version="2.0.2" \
release="0" \
summary="Base image for Zowe components" \
description="Base image for Zowe components"
maintainer="mark.ackert@broadcom.com" \
vendor="Zowe" \
version="3.0.0" \
release="0" \
summary="Base image for Zowe components" \
description="Base image for Zowe components"

##################################
# arguments
Expand All @@ -32,59 +32,58 @@ ARG NODE_CPU_ARCH=x64

##################################
# environments
ENV NODE_VERSION=16.18.1
ENV NODE_VERSION=18.20.4

##################################
# customize
RUN set -ex \
# shadow-utils is needed for having adduser groupadd commands
&& microdnf install --nodocs shadow-utils \
# define zowe user/group
&& groupadd --gid ${GID} zowe \
&& useradd -r -m --no-log-init --uid ${UID} --gid ${GID} --home /home/zowe zowe \
# create /licenses folder
&& mkdir -p /licenses \
&& chown zowe.zowe /licenses \
# create /component folder
&& mkdir -p /component \
&& chown zowe.zowe /component \
# install node.js which is mandatory for now
&& microdnf install --nodocs \
findutils \
tar \
xz \
&& ARCH=${NODE_CPU_ARCH} \
# gpg keys listed at https://github.com/nodejs/node#release-keys
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
108F52B48DB57BB0CC439B2997B01419BD92F80A \
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
; do \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
done \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
# smoke tests
&& node --version \
&& npm --version \
# remove unused pacakges
&& microdnf remove \
findutils \
tar \
xz \
# clean up
&& microdnf clean all --enablerepo='*'
# shadow-utils is needed for having adduser groupadd commands
&& microdnf install --nodocs shadow-utils \
# define zowe user/group
&& groupadd --gid ${GID} zowe \
&& useradd -r -m --no-log-init --uid ${UID} --gid ${GID} --home /home/zowe zowe \
# create /licenses folder
&& mkdir -p /licenses \
&& chown zowe.zowe /licenses \
# create /component folder
&& mkdir -p /component \
&& chown zowe.zowe /component \
# install node.js which is mandatory for now
&& microdnf install --nodocs \
findutils \
tar \
xz \
&& ARCH=${NODE_CPU_ARCH} \
# gpg keys listed at https://github.com/nodejs/node#release-keys
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
141F07595B7B3FFE74309A937405533BE57C7D57 \
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
CC68F5A3106FF448322E48ED27F5E38D5B0A215F \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
108F52B48DB57BB0CC439B2997B01419BD92F80A \
A363A499291CBBC940DD62E41F10027AF002F8B0 \
; do \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
done \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
# smoke tests
&& node --version \
&& npm --version \
# remove unused pacakges
&& microdnf remove \
findutils \
tar \
xz \
# clean up
&& microdnf clean all --enablerepo='*'
127 changes: 63 additions & 64 deletions containers/base/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ FROM ubuntu:latest
##################################
# labels
LABEL name="Zowe Base Image" \
maintainer="jack-tiefeng.jia@ibm.com" \
vendor="Zowe" \
version="2.0.2" \
release="0" \
summary="Base image for Zowe components" \
description="Base image for Zowe components"
maintainer="mark.ackert@broadcom.com" \
vendor="Zowe" \
version="3.0.0" \
release="0" \
summary="Base image for Zowe components" \
description="Base image for Zowe components"

##################################
# arguments
Expand All @@ -32,65 +32,64 @@ ARG NODE_CPU_ARCH=x64

##################################
# environments
ENV NODE_VERSION=16.18.1
ENV NODE_VERSION=18.20.4

##################################
# customize
RUN set -ex \
# define zowe user/group
&& groupadd -g $GID -r zowe \
&& useradd -r -m --no-log-init --uid ${UID} --gid ${GID} -d /home/zowe zowe \
# use bash as default shell
&& cd /bin \
&& ln -sfn bash sh \
# create /licenses folder
&& mkdir -p /licenses \
&& chown zowe.zowe /licenses \
# create /component folder
&& mkdir -p /component \
&& chown zowe.zowe /component \
# install node.js which is mandatory for now
&& apt-get update \
&& apt-get install -y \
curl \
gnupg \
xz-utils \
# upgrade
&& apt-get upgrade -y \
&& ARCH=${NODE_CPU_ARCH} \
# gpg keys listed at https://github.com/nodejs/node#release-keys
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
108F52B48DB57BB0CC439B2997B01419BD92F80A \
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
; do \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
done \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
# smoke tests
&& node --version \
&& npm --version \
# remove unused pacakges
&& apt-get purge --auto-remove -y \
bzip2 \
curl \
gnupg \
tini \
xz-utils \
# clean up
&& rm -rf /var/lib/apt/lists/*
# define zowe user/group
&& groupadd -g $GID -r zowe \
&& useradd -r -m --no-log-init --uid ${UID} --gid ${GID} -d /home/zowe zowe \
# use bash as default shell
&& cd /bin \
&& ln -sfn bash sh \
# create /licenses folder
&& mkdir -p /licenses \
&& chown zowe.zowe /licenses \
# create /component folder
&& mkdir -p /component \
&& chown zowe.zowe /component \
# install node.js which is mandatory for now
&& apt-get update \
&& apt-get install -y \
curl \
gnupg \
xz-utils \
# upgrade
&& apt-get upgrade -y \
&& ARCH=${NODE_CPU_ARCH} \
# gpg keys listed at https://github.com/nodejs/node#release-keys
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
141F07595B7B3FFE74309A937405533BE57C7D57 \
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
CC68F5A3106FF448322E48ED27F5E38D5B0A215F \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
108F52B48DB57BB0CC439B2997B01419BD92F80A \
A363A499291CBBC940DD62E41F10027AF002F8B0 \
; do \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
done \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
# smoke tests
&& node --version \
&& npm --version \
# remove unused pacakges
&& apt-get purge --auto-remove -y \
bzip2 \
curl \
gnupg \
tini \
xz-utils \
# clean up
&& rm -rf /var/lib/apt/lists/*
Loading