Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions 11.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM cimg/base:2024.02

LABEL maintainer="CircleCI Execution Team <[email protected]>"

ENV JAVA_VERSION=11.0.28
ENV JAVA_VERSION=11.0.29
ENV JAVA_HOME=/usr/local/jdk-${JAVA_VERSION}

RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="aarch64" && \
Expand All @@ -22,8 +22,15 @@ 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_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"; \
if [ "$JAVA_VERSION" = "$JAVA_MAJOR_VERSION".0 ]; then \
START_WITH_VERSION=${JAVA_MAJOR_VERSION}; \
JAVA_SEARCH=${JAVA_MAJOR_VERSION}; \
else \
START_WITH_VERSION=${JAVA_VERSION}; \
JAVA_SEARCH=${JAVA_VERSION}; \
fi && \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases" | jq "limit(1; .[] | select(.tag_name | startswith(\"jdk-${START_WITH_VERSION}+\"))) | .tag_name | split(\"+\")[1]" | tr -d '"'); \
URL="https://github.com/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases/download/jdk-${JAVA_SEARCH}%2B${JAVA_BUILD%.*}/OpenJDK${JAVA_MAJOR_VERSION}U-jdk_${ARCH}_linux_hotspot_${JAVA_SEARCH}_${JAVA_BUILD%.*}.tar.gz"; \
fi && \
curl -sSL -o java.tar.gz "${URL}" && \
sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
Expand Down Expand Up @@ -60,9 +67,9 @@ RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-b
sudo ln -s /opt/gradle-* /opt/gradle && \
gradle --version

ENV SBT_VERSION=1.11.3 \
ENV SBT_VERSION=1.11.7 \
PATH=/opt/sbt/bin:$PATH
ENV MILL_VERSION=1.0.1
ENV MILL_VERSION=1.0.6
RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
sudo tar -xzf sbt.tar.gz -C /opt/ && \
Expand Down
2 changes: 1 addition & 1 deletion 11.0/browsers/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:11.0.28-node
FROM cimg/openjdk:11.0.29-node

LABEL maintainer="CircleCI Community & Partner Engineering Team <[email protected]>"

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

FROM cimg/openjdk:11.0.28
FROM cimg/openjdk:11.0.29

LABEL maintainer="Community & Partner Engineering Team <[email protected]>"

Expand Down
17 changes: 12 additions & 5 deletions 17.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM cimg/base:2024.02

LABEL maintainer="CircleCI Execution Team <[email protected]>"

ENV JAVA_VERSION=17.0.16
ENV JAVA_VERSION=17.0.17
ENV JAVA_HOME=/usr/local/jdk-${JAVA_VERSION}

RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="aarch64" && \
Expand All @@ -22,8 +22,15 @@ 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_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"; \
if [ "$JAVA_VERSION" = "$JAVA_MAJOR_VERSION".0 ]; then \
START_WITH_VERSION=${JAVA_MAJOR_VERSION}; \
JAVA_SEARCH=${JAVA_MAJOR_VERSION}; \
else \
START_WITH_VERSION=${JAVA_VERSION}; \
JAVA_SEARCH=${JAVA_VERSION}; \
fi && \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases" | jq "limit(1; .[] | select(.tag_name | startswith(\"jdk-${START_WITH_VERSION}+\"))) | .tag_name | split(\"+\")[1]" | tr -d '"'); \
URL="https://github.com/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases/download/jdk-${JAVA_SEARCH}%2B${JAVA_BUILD%.*}/OpenJDK${JAVA_MAJOR_VERSION}U-jdk_${ARCH}_linux_hotspot_${JAVA_SEARCH}_${JAVA_BUILD%.*}.tar.gz"; \
fi && \
curl -sSL -o java.tar.gz "${URL}" && \
sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
Expand Down Expand Up @@ -60,9 +67,9 @@ RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-b
sudo ln -s /opt/gradle-* /opt/gradle && \
gradle --version

ENV SBT_VERSION=1.11.3 \
ENV SBT_VERSION=1.11.7 \
PATH=/opt/sbt/bin:$PATH
ENV MILL_VERSION=1.0.1
ENV MILL_VERSION=1.0.6
RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
sudo tar -xzf sbt.tar.gz -C /opt/ && \
Expand Down
2 changes: 1 addition & 1 deletion 17.0/browsers/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:17.0.16-node
FROM cimg/openjdk:17.0.17-node

LABEL maintainer="CircleCI Community & Partner Engineering Team <[email protected]>"

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

FROM cimg/openjdk:17.0.16
FROM cimg/openjdk:17.0.17

LABEL maintainer="Community & Partner Engineering Team <[email protected]>"

Expand Down
17 changes: 12 additions & 5 deletions 21.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM cimg/base:2024.02

LABEL maintainer="CircleCI Execution Team <[email protected]>"

ENV JAVA_VERSION=21.0.8
ENV JAVA_VERSION=21.0.9
ENV JAVA_HOME=/usr/local/jdk-${JAVA_VERSION}

RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="aarch64" && \
Expand All @@ -22,8 +22,15 @@ 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_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"; \
if [ "$JAVA_VERSION" = "$JAVA_MAJOR_VERSION".0 ]; then \
START_WITH_VERSION=${JAVA_MAJOR_VERSION}; \
JAVA_SEARCH=${JAVA_MAJOR_VERSION}; \
else \
START_WITH_VERSION=${JAVA_VERSION}; \
JAVA_SEARCH=${JAVA_VERSION}; \
fi && \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases" | jq "limit(1; .[] | select(.tag_name | startswith(\"jdk-${START_WITH_VERSION}+\"))) | .tag_name | split(\"+\")[1]" | tr -d '"'); \
URL="https://github.com/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases/download/jdk-${JAVA_SEARCH}%2B${JAVA_BUILD%.*}/OpenJDK${JAVA_MAJOR_VERSION}U-jdk_${ARCH}_linux_hotspot_${JAVA_SEARCH}_${JAVA_BUILD%.*}.tar.gz"; \
fi && \
curl -sSL -o java.tar.gz "${URL}" && \
sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
Expand Down Expand Up @@ -60,9 +67,9 @@ RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-b
sudo ln -s /opt/gradle-* /opt/gradle && \
gradle --version

ENV SBT_VERSION=1.11.3 \
ENV SBT_VERSION=1.11.7 \
PATH=/opt/sbt/bin:$PATH
ENV MILL_VERSION=1.0.1
ENV MILL_VERSION=1.0.6
RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
sudo tar -xzf sbt.tar.gz -C /opt/ && \
Expand Down
2 changes: 1 addition & 1 deletion 21.0/browsers/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:21.0.8-node
FROM cimg/openjdk:21.0.9-node

LABEL maintainer="CircleCI Community & Partner Engineering Team <[email protected]>"

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

FROM cimg/openjdk:21.0.8
FROM cimg/openjdk:21.0.9

LABEL maintainer="Community & Partner Engineering Team <[email protected]>"

Expand Down
2 changes: 1 addition & 1 deletion 24.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN dl_URL="https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apa
sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
mvn --version

ENV GRADLE_VERSION=9.1.0 \
ENV GRADLE_VERSION=8.14.3 \
PATH=/opt/gradle/bin:$PATH
RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" && \
curl -sSL --fail --retry 3 $dl_URL -o gradle.zip && \
Expand Down
2 changes: 1 addition & 1 deletion 25.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN dl_URL="https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apa
sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
mvn --version

ENV GRADLE_VERSION=9.1.0 \
ENV GRADLE_VERSION=8.14.3 \
PATH=/opt/gradle/bin:$PATH
RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" && \
curl -sSL --fail --retry 3 $dl_URL -o gradle.zip && \
Expand Down
17 changes: 12 additions & 5 deletions 8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM cimg/base:2024.02

LABEL maintainer="CircleCI Execution Team <[email protected]>"

ENV JAVA_VERSION=8.0.462
ENV JAVA_VERSION=8.0.472
ENV JAVA_HOME=/usr/local/jdk-${JAVA_VERSION}

RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="aarch64" && \
Expand All @@ -22,8 +22,15 @@ 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_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"; \
if [ "$JAVA_VERSION" = "$JAVA_MAJOR_VERSION".0 ]; then \
START_WITH_VERSION=${JAVA_MAJOR_VERSION}; \
JAVA_SEARCH=${JAVA_MAJOR_VERSION}; \
else \
START_WITH_VERSION=${JAVA_VERSION}; \
JAVA_SEARCH=${JAVA_VERSION}; \
fi && \
JAVA_BUILD=$(curl -s "https://api.github.com/repos/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases" | jq "limit(1; .[] | select(.tag_name | startswith(\"jdk-${START_WITH_VERSION}+\"))) | .tag_name | split(\"+\")[1]" | tr -d '"'); \
URL="https://github.com/adoptium/temurin${JAVA_MAJOR_VERSION}-binaries/releases/download/jdk-${JAVA_SEARCH}%2B${JAVA_BUILD%.*}/OpenJDK${JAVA_MAJOR_VERSION}U-jdk_${ARCH}_linux_hotspot_${JAVA_SEARCH}_${JAVA_BUILD%.*}.tar.gz"; \
fi && \
curl -sSL -o java.tar.gz "${URL}" && \
sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
Expand Down Expand Up @@ -60,9 +67,9 @@ RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-b
sudo ln -s /opt/gradle-* /opt/gradle && \
gradle --version

ENV SBT_VERSION=1.11.3 \
ENV SBT_VERSION=1.11.7 \
PATH=/opt/sbt/bin:$PATH
ENV MILL_VERSION=1.0.1
ENV MILL_VERSION=1.0.6
RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
sudo tar -xzf sbt.tar.gz -C /opt/ && \
Expand Down
2 changes: 1 addition & 1 deletion 8.0/browsers/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:8.0.462-node
FROM cimg/openjdk:8.0.472-node

LABEL maintainer="CircleCI Community & Partner Engineering Team <[email protected]>"

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

FROM cimg/openjdk:8.0.462
FROM cimg/openjdk:8.0.472

LABEL maintainer="Community & Partner Engineering Team <[email protected]>"

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN dl_URL="https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apa
sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
mvn --version

ENV GRADLE_VERSION=9.1.0 \
ENV GRADLE_VERSION=8.14.3 \
PATH=/opt/gradle/bin:$PATH
RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" && \
curl -sSL --fail --retry 3 $dl_URL -o gradle.zip && \
Expand Down
2 changes: 1 addition & 1 deletion GEN-CHECK
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GEN_CHECK=(24.0.2)
GEN_CHECK=(8.0.472 11.0.29 17.0.17 21.0.9)
15 changes: 12 additions & 3 deletions build-images.sh
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 24.0/Dockerfile -t cimg/openjdk:24.0.2 -t cimg/openjdk:24.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 24.0/node/Dockerfile -t cimg/openjdk:24.0.2-node -t cimg/openjdk:24.0-node --push .
docker buildx build --platform=linux/amd64 --file 24.0/browsers/Dockerfile -t cimg/openjdk:24.0.2-browsers -t cimg/openjdk:24.0-browsers --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 8.0/Dockerfile -t cimg/openjdk:8.0.472 -t cimg/openjdk:8.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 8.0/node/Dockerfile -t cimg/openjdk:8.0.472-node -t cimg/openjdk:8.0-node --push .
docker buildx build --platform=linux/amd64 --file 8.0/browsers/Dockerfile -t cimg/openjdk:8.0.472-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.29 -t cimg/openjdk:11.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 11.0/node/Dockerfile -t cimg/openjdk:11.0.29-node -t cimg/openjdk:11.0-node --push .
docker buildx build --platform=linux/amd64 --file 11.0/browsers/Dockerfile -t cimg/openjdk:11.0.29-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.17 -t cimg/openjdk:17.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 17.0/node/Dockerfile -t cimg/openjdk:17.0.17-node -t cimg/openjdk:17.0-node --push .
docker buildx build --platform=linux/amd64 --file 17.0/browsers/Dockerfile -t cimg/openjdk:17.0.17-browsers -t cimg/openjdk:17.0-browsers --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 21.0/Dockerfile -t cimg/openjdk:21.0.9 -t cimg/openjdk:21.0 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 21.0/node/Dockerfile -t cimg/openjdk:21.0.9-node -t cimg/openjdk:21.0-node --push .
docker buildx build --platform=linux/amd64 --file 21.0/browsers/Dockerfile -t cimg/openjdk:21.0.9-browsers -t cimg/openjdk:21.0-browsers --push .
1 change: 1 addition & 0 deletions openJDKFeed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ else
fi

getGradleVersion() {
# Check compatibiliy matrix https://docs.gradle.org/current/userguide/compatibility.html
local templateFile=$1

RSS_URL="https://github.com/gradle/gradle/releases.atom"
Expand Down