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

Pub: v8.0.432, v11.0.25, v17.0.13, and more. [release] #220

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Pub: v8.0.432, v11.0.25, v17.0.13, and more. [release] #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions 11.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ FROM cimg/base:2024.02

LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"

ENV JAVA_VERSION 11.0.24
ENV JAVA_VERSION 11.0.25
ENV JAVA_HOME /usr/local/jdk-${JAVA_VERSION}

RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="aarch64" && \
JAVA_MAJOR_VERSION=$(echo "$JAVA_VERSION" | cut -d '.' -f 1) && \
JAVA_PATCH_VERSION=$(echo "$JAVA_VERSION" | cut -d '.' -f 3) && \
if [ "$JAVA_MAJOR_VERSION" = "8" ]; then \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin8-binaries/releases" | jq ".[] | select(.tag_name | startswith(\"jdk8u${JAVA_PATCH_VERSION}\")) | .tag_name" | tr -d '"'); \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin8-binaries/releases" | jq ".[] | select(.tag_name | startswith(\"jdk8u${JAVA_PATCH_VERSION}\")) | select(.tag_name | contains("-beta") | not) | .tag_name" | tr -d '"'); \
JAVA_BUILD="${JAVA_BUILD/jdk8u/}"; \
JAVA_BUILD_SANITISED="${JAVA_BUILD//-/}"; \
URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u${JAVA_BUILD}/OpenJDK8U-jdk_${ARCH}_linux_hotspot_8u${JAVA_BUILD_SANITISED}.tar.gz"; \
Expand Down
2 changes: 1 addition & 1 deletion 11.0/browsers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:11.0.24-node
FROM cimg/openjdk:11.0.25-node

LABEL maintainer="CircleCI Community & Partner Engineering Team <community-partner@circleci.com>"

Expand Down
2 changes: 1 addition & 1 deletion 11.0/node/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:11.0.24
FROM cimg/openjdk:11.0.25

LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"

Expand Down
4 changes: 2 additions & 2 deletions 17.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ FROM cimg/base:2024.02

LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"

ENV JAVA_VERSION 17.0.12
ENV JAVA_VERSION 17.0.13
ENV JAVA_HOME /usr/local/jdk-${JAVA_VERSION}

RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="aarch64" && \
JAVA_MAJOR_VERSION=$(echo "$JAVA_VERSION" | cut -d '.' -f 1) && \
JAVA_PATCH_VERSION=$(echo "$JAVA_VERSION" | cut -d '.' -f 3) && \
if [ "$JAVA_MAJOR_VERSION" = "8" ]; then \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin8-binaries/releases" | jq ".[] | select(.tag_name | startswith(\"jdk8u${JAVA_PATCH_VERSION}\")) | .tag_name" | tr -d '"'); \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin8-binaries/releases" | jq ".[] | select(.tag_name | startswith(\"jdk8u${JAVA_PATCH_VERSION}\")) | select(.tag_name | contains("-beta") | not) | .tag_name" | tr -d '"'); \
JAVA_BUILD="${JAVA_BUILD/jdk8u/}"; \
JAVA_BUILD_SANITISED="${JAVA_BUILD//-/}"; \
URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u${JAVA_BUILD}/OpenJDK8U-jdk_${ARCH}_linux_hotspot_8u${JAVA_BUILD_SANITISED}.tar.gz"; \
Expand Down
2 changes: 1 addition & 1 deletion 17.0/browsers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:17.0.12-node
FROM cimg/openjdk:17.0.13-node

LABEL maintainer="CircleCI Community & Partner Engineering Team <community-partner@circleci.com>"

Expand Down
2 changes: 1 addition & 1 deletion 17.0/node/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:17.0.12
FROM cimg/openjdk:17.0.13

LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"

Expand Down
12 changes: 6 additions & 6 deletions 23.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ FROM cimg/base:2024.02

LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"

ENV JAVA_VERSION=23.0
ENV JAVA_HOME=/usr/local/jdk-${JAVA_VERSION}
ENV JAVA_VERSION 23.0.1
ENV JAVA_HOME /usr/local/jdk-${JAVA_VERSION}

RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="aarch64" && \
JAVA_MAJOR_VERSION=$(echo "$JAVA_VERSION" | cut -d '.' -f 1) && \
Expand All @@ -22,17 +22,17 @@ RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="aarch64" && \
JAVA_BUILD_SANITISED="${JAVA_BUILD//-/}"; \
URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u${JAVA_BUILD}/OpenJDK8U-jdk_${ARCH}_linux_hotspot_8u${JAVA_BUILD_SANITISED}.tar.gz"; \
else \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases" | jq "limit(1; .[] | select(.tag_name | startswith(\"jdk-${JAVA_MAJOR_VERSION}+\"))) | .tag_name | split(\"+\")[1]" | tr -d '"'); \
URL="https://github.com/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases/download/jdk-${JAVA_MAJOR_VERSION}%2B${JAVA_BUILD%.*}/OpenJDK${JAVA_MAJOR_VERSION}U-jdk_${ARCH}_linux_hotspot_${JAVA_MAJOR_VERSION}_${JAVA_BUILD%.*}.tar.gz"; \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases" | jq "limit(1; .[] | select(.tag_name | startswith(\"jdk-${JAVA_VERSION}+\"))) | .tag_name | split(\"+\")[1]" | tr -d '"'); \
URL="https://github.com/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases/download/jdk-${JAVA_VERSION}%2B${JAVA_BUILD%.*}/OpenJDK${JAVA_MAJOR_VERSION}U-jdk_${ARCH}_linux_hotspot_${JAVA_VERSION}_${JAVA_BUILD%.*}.tar.gz"; \
fi && \
curl -sSL -o java.tar.gz "${URL}" && \
sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
sudo tar -xzf java.tar.gz --strip-components=1 -C /usr/local/jdk-${JAVA_VERSION} && \
rm java.tar.gz && \
if [[ "$JAVA_VERSION" == *".0"* ]]; then \
if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-23; \
fi && \
sudo ln -s /usr/local/jdk-${JAVA_MAJOR_VERSION}/bin/* /usr/bin/ && \
sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/* /usr/bin/ && \
sudo mkdir -p /etc/ssl/certs/java/cacerts && \
sudo ln -s ${JAVA_HOME}/lib/security/cacerts /etc/ssl/certs/java/cacerts && \
# Install packages to help with legacy image migration
Expand Down
2 changes: 1 addition & 1 deletion 23.0/browsers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:23.0-node
FROM cimg/openjdk:23.0.1-node

LABEL maintainer="CircleCI Community & Partner Engineering Team <community-partner@circleci.com>"

Expand Down
2 changes: 1 addition & 1 deletion 23.0/node/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:23.0
FROM cimg/openjdk:23.0.1

LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"

Expand Down
12 changes: 4 additions & 8 deletions 8.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,16 @@ FROM cimg/base:2024.02

LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"

ENV JAVA_VERSION 8.0.422
ENV JAVA_VERSION 8.0.432
ENV JAVA_HOME /usr/local/jdk-${JAVA_VERSION}

RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="aarch64" && \
JAVA_MAJOR_VERSION=$(echo "$JAVA_VERSION" | cut -d '.' -f 1) && \
JAVA_PATCH_VERSION=$(echo "$JAVA_VERSION" | cut -d '.' -f 3) && \
if [ "$JAVA_MAJOR_VERSION" = "8" ]; then \
# N.B. this is a release hotfix! 8u422-b05.1 was a mac-only security release \
# https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz \
JAVA_BUILD="422-b05"; \
JAVA_BUILD_SANITISED="422b05"; \
#JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin8-binaries/releases" | jq ".[] | select(.tag_name | startswith(\"jdk8u${JAVA_PATCH_VERSION}\")) | .tag_name" | tr -d '"'); \
#JAVA_BUILD="${JAVA_BUILD/jdk8u/}"; \
#JAVA_BUILD_SANITISED="${JAVA_BUILD//-/}"; \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin8-binaries/releases" | jq ".[] | select(.tag_name | startswith(\"jdk8u${JAVA_PATCH_VERSION}\")) | select(.tag_name | contains("-beta") | not) | .tag_name" | tr -d '"'); \
JAVA_BUILD="${JAVA_BUILD/jdk8u/}"; \
JAVA_BUILD_SANITISED="${JAVA_BUILD//-/}"; \
URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u${JAVA_BUILD}/OpenJDK8U-jdk_${ARCH}_linux_hotspot_8u${JAVA_BUILD_SANITISED}.tar.gz"; \
else \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases" | jq "limit(1; .[] | select(.tag_name | startswith(\"jdk-${JAVA_VERSION}+\"))) | .tag_name | split(\"+\")[1]" | tr -d '"'); \
Expand Down
2 changes: 1 addition & 1 deletion 8.0/browsers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:8.0.422-node
FROM cimg/openjdk:8.0.432-node

LABEL maintainer="CircleCI Community & Partner Engineering Team <community-partner@circleci.com>"

Expand Down
2 changes: 1 addition & 1 deletion 8.0/node/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:8.0.422
FROM cimg/openjdk:8.0.432

LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"

Expand Down
2 changes: 1 addition & 1 deletion GEN-CHECK
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GEN_CHECK=(21.0.5)
GEN_CHECK=(8.0.432 11.0.25 17.0.13 23.0.1)
15 changes: 12 additions & 3 deletions build-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ set -eo pipefail

docker context create cimg
docker buildx create --use cimg
docker buildx build --platform=linux/amd64,linux/arm64 --file 21.0/Dockerfile -t cimg/openjdk:21.0.5 -t cimg/openjdk:21.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 21.0/node/Dockerfile -t cimg/openjdk:21.0.5-node -t cimg/openjdk:21.0-node --push .
docker buildx build --platform=linux/amd64 --file 21.0/browsers/Dockerfile -t cimg/openjdk:21.0.5-browsers -t cimg/openjdk:21.0-browsers --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 8.0/Dockerfile -t cimg/openjdk:8.0.432 -t cimg/openjdk:8.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 8.0/node/Dockerfile -t cimg/openjdk:8.0.432-node -t cimg/openjdk:8.0-node --push .
docker buildx build --platform=linux/amd64 --file 8.0/browsers/Dockerfile -t cimg/openjdk:8.0.432-browsers -t cimg/openjdk:8.0-browsers --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 11.0/Dockerfile -t cimg/openjdk:11.0.25 -t cimg/openjdk:11.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 11.0/node/Dockerfile -t cimg/openjdk:11.0.25-node -t cimg/openjdk:11.0-node --push .
docker buildx build --platform=linux/amd64 --file 11.0/browsers/Dockerfile -t cimg/openjdk:11.0.25-browsers -t cimg/openjdk:11.0-browsers --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 17.0/Dockerfile -t cimg/openjdk:17.0.13 -t cimg/openjdk:17.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 17.0/node/Dockerfile -t cimg/openjdk:17.0.13-node -t cimg/openjdk:17.0-node --push .
docker buildx build --platform=linux/amd64 --file 17.0/browsers/Dockerfile -t cimg/openjdk:17.0.13-browsers -t cimg/openjdk:17.0-browsers --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 23.0/Dockerfile -t cimg/openjdk:23.0.1 -t cimg/openjdk:23.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 23.0/node/Dockerfile -t cimg/openjdk:23.0.1-node -t cimg/openjdk:23.0-node --push .
docker buildx build --platform=linux/amd64 --file 23.0/browsers/Dockerfile -t cimg/openjdk:23.0.1-browsers -t cimg/openjdk:23.0-browsers --push .