Skip to content

Commit

Permalink
Pub: v8.0.282, v11.0.10, v15.0.2, and more. [release] (CircleCI-Publi…
Browse files Browse the repository at this point in the history
  • Loading branch information
FelicianoTech authored Mar 19, 2021
1 parent 431edd9 commit 7c4e158
Show file tree
Hide file tree
Showing 13 changed files with 158 additions and 23 deletions.
8 changes: 4 additions & 4 deletions 11.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# vim:set ft=dockerfile:

FROM cimg/base:2020.09
FROM cimg/base:2021.03

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

ENV JAVA_VERSION 11.0.9
ENV URL https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz
ENV JAVA_VERSION 11.0.10
ENV URL https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz
ENV JAVA_HOME /usr/local/jdk-${JAVA_VERSION}

RUN curl -sSL -o java.tar.gz "${URL}" && \
Expand Down Expand Up @@ -33,7 +33,7 @@ RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
mvn --version

ENV GRADLE_VERSION=6.7 \
ENV GRADLE_VERSION=6.8.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 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.9-node
FROM cimg/openjdk:11.0.10-node

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

Expand Down
4 changes: 2 additions & 2 deletions 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.9
FROM cimg/openjdk:11.0.10

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

Expand All @@ -12,7 +12,7 @@ RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/maste
rm node.tar.xz nodeAliases.txt && \
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs

ENV YARN_VERSION 1.22.4
ENV YARN_VERSION 1.22.5
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
sudo tar -xzf yarn.tar.gz -C /opt/ && \
rm yarn.tar.gz && \
Expand Down
8 changes: 4 additions & 4 deletions 15.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# vim:set ft=dockerfile:

FROM cimg/base:2020.09
FROM cimg/base:2021.03

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

ENV JAVA_VERSION 15.0.1
ENV URL https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz
ENV JAVA_VERSION 15.0.2
ENV URL https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz
ENV JAVA_HOME /usr/local/jdk-${JAVA_VERSION}

RUN curl -sSL -o java.tar.gz "${URL}" && \
Expand Down Expand Up @@ -33,7 +33,7 @@ RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
mvn --version

ENV GRADLE_VERSION=6.7 \
ENV GRADLE_VERSION=6.8.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 15.0/browsers/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:15.0.1-node
FROM cimg/openjdk:15.0.2-node

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

Expand Down
4 changes: 2 additions & 2 deletions 15.0/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:15.0.1
FROM cimg/openjdk:15.0.2

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

Expand All @@ -12,7 +12,7 @@ RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/maste
rm node.tar.xz nodeAliases.txt && \
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs

ENV YARN_VERSION 1.22.4
ENV YARN_VERSION 1.22.5
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
sudo tar -xzf yarn.tar.gz -C /opt/ && \
rm yarn.tar.gz && \
Expand Down
43 changes: 43 additions & 0 deletions 16.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# vim:set ft=dockerfile:

FROM cimg/base:2021.03

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

ENV JAVA_VERSION 16.0.0
ENV URL https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz
ENV JAVA_HOME /usr/local/jdk-${JAVA_VERSION}

RUN 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 && \
sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/java /usr/bin/java && \
sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javac /usr/bin/javac && \
sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javaws /usr/bin/javaws && \
# Install packages to help with legacy image migration
sudo apt-get update && sudo apt-get install -y \
fontconfig \
&& \
sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
# The dual version command is to support OpenJDK 8
java --version || java -version && \
javac --version || javac -version

ENV MAVEN_VERSION=3.6.3 \
PATH=/opt/apache-maven/bin:$PATH
RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" && \
curl -sSL --fail --retry 3 $dl_URL -o apache-maven.tar.gz && \
sudo tar -xzf apache-maven.tar.gz -C /opt/ && \
rm apache-maven.tar.gz && \
sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
mvn --version

ENV GRADLE_VERSION=6.8.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 && \
sudo unzip -d /opt gradle.zip && \
rm gradle.zip && \
sudo ln -s /opt/gradle-* /opt/gradle && \
gradle --version
63 changes: 63 additions & 0 deletions 16.0/browsers/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:16.0.0-node

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

# Install Selenium
ENV SELENIUM_VER=3.141.59
RUN curl -sSL -o selenium-server-standalone-${SELENIUM_VER}.jar "https://selenium-release.storage.googleapis.com/${SELENIUM_VER%.*}/selenium-server-standalone-${SELENIUM_VER}.jar" && \
sudo cp selenium-server-standalone-${SELENIUM_VER}.jar /usr/local/bin/selenium.jar && \
rm selenium-server-standalone-${SELENIUM_VER}.jar

RUN sudo apt-get update && \

# Install Java only if it's not already available
# Java is installed for Selenium
if ! command -v java > /dev/null; then \
echo "Java not found in parent image, installing..." && \
sudo apt-get install -y --no-install-recommends --no-upgrade openjdk-11-jre; \
fi && \

# Firefox deps
sudo apt-get install -y --no-install-recommends --no-upgrade \
libdbus-glib-1-2 \
libgtk-3-dev \
libxt6 \
&& \

# Google Chrome deps
# Some of these packages should be pulled into their own section
sudo apt-get install -y --no-install-recommends --no-upgrade \
fonts-liberation \
libappindicator3-1 \
libasound2 \
libatk-bridge2.0-0 \
libatspi2.0-0 \
libcairo2 \
libcups2 \
libgbm1 \
libgdk-pixbuf2.0-0 \
libgtk-3-0 \
libpango-1.0-0 \
libpangocairo-1.0-0 \
libxcursor1 \
libxss1 \
xdg-utils \
xvfb \
&& \
sudo rm -rf /var/lib/apt/lists/*

# Below is setup to allow xvfb to start when the container starts up.
# The label in particular allows this image to override what CircleCI does
# when booting the image.
LABEL com.circleci.preserve-entrypoint=true
ENV DISPLAY=":99"
#RUN printf '#!/bin/sh\nXvfb :99 -screen 0 1280x1024x24 &\nexec "$@"\n' > /tmp/entrypoint && \
# chmod +x /tmp/entrypoint && \
# sudo mv /tmp/entrypoint /docker-entrypoint.sh
RUN printf '#!/bin/sh\nXvfb :99 -screen 0 1280x1024x24 &\nexec "$@"\n' | sudo tee /docker-entrypoint.sh && \
sudo chmod +x /docker-entrypoint.sh

ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["/bin/sh"]
20 changes: 20 additions & 0 deletions 16.0/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# vim:set ft=dockerfile:

FROM cimg/openjdk:16.0.0

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

# Dockerfile will pull the latest LTS release from cimg-node.
RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/master/ALIASES" -o nodeAliases.txt && \
NODE_VERSION=$(grep "lts" ./nodeAliases.txt | cut -d "=" -f 2-) && \
curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
rm node.tar.xz nodeAliases.txt && \
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs

ENV YARN_VERSION 1.22.5
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
sudo tar -xzf yarn.tar.gz -C /opt/ && \
rm yarn.tar.gz && \
sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg
8 changes: 4 additions & 4 deletions 8.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# vim:set ft=dockerfile:

FROM cimg/base:2020.09
FROM cimg/base:2021.03

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

ENV JAVA_VERSION 8.0.275
ENV URL https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u275b01.tar.gz
ENV JAVA_VERSION 8.0.282
ENV URL https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
ENV JAVA_HOME /usr/local/jdk-${JAVA_VERSION}

RUN curl -sSL -o java.tar.gz "${URL}" && \
Expand Down Expand Up @@ -33,7 +33,7 @@ RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
mvn --version

ENV GRADLE_VERSION=6.7 \
ENV GRADLE_VERSION=6.8.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 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.275-node
FROM cimg/openjdk:8.0.282-node

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

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.275
FROM cimg/openjdk:8.0.282

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

Expand Down
15 changes: 12 additions & 3 deletions build-images.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
#!/usr/bin/env bash

docker build --file 8.0/Dockerfile -t cimg/openjdk:8.0.275 -t cimg/openjdk:8.0 .
docker build --file 8.0/node/Dockerfile -t cimg/openjdk:8.0.275-node -t cimg/openjdk:8.0-node .
docker build --file 8.0/browsers/Dockerfile -t cimg/openjdk:8.0.275-browsers -t cimg/openjdk:8.0-browsers .
docker build --file 8.0/Dockerfile -t cimg/openjdk:8.0.282 -t cimg/openjdk:8.0 .
docker build --file 8.0/node/Dockerfile -t cimg/openjdk:8.0.282-node -t cimg/openjdk:8.0-node .
docker build --file 8.0/browsers/Dockerfile -t cimg/openjdk:8.0.282-browsers -t cimg/openjdk:8.0-browsers .
docker build --file 11.0/Dockerfile -t cimg/openjdk:11.0.10 -t cimg/openjdk:11.0 .
docker build --file 11.0/node/Dockerfile -t cimg/openjdk:11.0.10-node -t cimg/openjdk:11.0-node .
docker build --file 11.0/browsers/Dockerfile -t cimg/openjdk:11.0.10-browsers -t cimg/openjdk:11.0-browsers .
docker build --file 15.0/Dockerfile -t cimg/openjdk:15.0.2 -t cimg/openjdk:15.0 .
docker build --file 15.0/node/Dockerfile -t cimg/openjdk:15.0.2-node -t cimg/openjdk:15.0-node .
docker build --file 15.0/browsers/Dockerfile -t cimg/openjdk:15.0.2-browsers -t cimg/openjdk:15.0-browsers .
docker build --file 16.0/Dockerfile -t cimg/openjdk:16.0.0 -t cimg/openjdk:16.0 .
docker build --file 16.0/node/Dockerfile -t cimg/openjdk:16.0.0-node -t cimg/openjdk:16.0-node .
docker build --file 16.0/browsers/Dockerfile -t cimg/openjdk:16.0.0-browsers -t cimg/openjdk:16.0-browsers .

0 comments on commit 7c4e158

Please sign in to comment.