Manually download and prepare boot JDKs

The problem with the previous approach of using Ubuntu packages was that
JDK packages might not exist for the required boot JDK version, especially
if that version is not an LTS one.

Author: Marcono1234

Dockerfile

@@ -20,13 +20,18 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get -y instal
     libfontconfig1-dev
 
 # Install boot JDK
-ARG BOOT_JDK_VERSION=18
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get -y install --no-install-recommends \
-    "openjdk-${BOOT_JDK_VERSION}-jdk-headless"
+ARG BOOT_JDK_URL="https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1+1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz"
+RUN apt-get -y install ca-certificates \
+    && wget --no-verbose "${BOOT_JDK_URL}" --output-document=boot-jdk.tar.gz \
+    && mkdir boot-jdk \
+    # --strip-components because all JDK files are nested inside a directory in the archive
+    && tar -xzf boot-jdk.tar.gz -C boot-jdk --strip-components=1 \
+    && rm boot-jdk.tar.gz
 
 # Set up CodeQL CLI
 ARG CODEQL_CLI_VERSION=2.10.5
-RUN wget -q "https://github.com/github/codeql-cli-binaries/releases/download/v${CODEQL_CLI_VERSION}/codeql-linux64.zip" --output-document=codeql-linux64.zip \
+RUN apt-get -y install ca-certificates \
+    && wget --no-verbose "https://github.com/github/codeql-cli-binaries/releases/download/v${CODEQL_CLI_VERSION}/codeql-linux64.zip" --output-document=codeql-linux64.zip \
     && unzip -q -d codeql-cli codeql-linux64.zip \
     && rm codeql-linux64.zip
 

README.md

@@ -34,8 +34,7 @@ Note: Building the Docker image, the JDK and the CodeQL database are all resourc
 
 ### Docker image configuration
 The Dockerfile uses [build-time variables](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg) for configuration.
-- `BOOT_JDK_VERSION`: Version of the [boot JDK](https://github.com/openjdk/jdk/blob/master/doc/building.md#boot-jdk-requirements), e.g. `16`  
-The value is used for the package retrieved from the package repository of Ubuntu, make sure that a package for this version exists.
+- `BOOT_JDK_URL`: URL of the JDK to be used as [boot JDK](https://github.com/openjdk/jdk/blob/master/doc/building.md#boot-jdk-requirements). The URL should be a download link for a `.tar.gz` file containing all JDK files nested in an extra directory. For example the [Eclipse Adoptium](https://adoptium.net) download URLs of the GitHub releases can be used.
 - `CODEQL_CLI_VERSION`: Version of [CodeQL CLI](https://github.com/github/codeql-cli-binaries/releases) to use for building the database, e.g. `2.5.7`
 
 ### Build configuration

docker_scripts/create_database.sh

@@ -145,7 +145,8 @@ fi
 echo "Building JDK commit ${ACTUAL_COMMIT_SHA}"
 
 # Specify build and host OS to avoid detection of WSL as Windows
-CONF_COMMAND="configure --build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu"
+# Boot JDK is prepared by Dockerfile
+CONF_COMMAND="configure --build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu --with-boot-jdk=../boot-jdk"
 
 # Build performance customization
 # https://github.com/openjdk/jdk/blob/master/doc/building.md#build-performance

jdk-versions/jdk-11-linux.cmd

@@ -2,4 +2,4 @@
 IF NOT EXIST "databases/" mkdir databases || EXIT 1
 
 @REM Build image, then start container (with `--rm` to remove it once finished)
-docker build .. -t codeql-jdk:11-linux --build-arg BOOT_JDK_VERSION=11 && docker container run --rm --name "codeql-jdk-11-linux-db-build" --mount type=bind,source="%cd%/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:11-linux --jdk-git-repo https://github.com/openjdk/jdk11u --jdk-version-name 11-linux %*
+docker build .. -t codeql-jdk:11-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1+1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz && docker container run --rm --name "codeql-jdk-11-linux-db-build" --mount type=bind,source="%cd%/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:11-linux --jdk-git-repo https://github.com/openjdk/jdk11u --jdk-version-name 11-linux %*

jdk-versions/jdk-11-linux.sh

@@ -4,5 +4,5 @@ set -e
 # Create output directory
 mkdir -p databases
 # Build image, then start container (with `--rm` to remove it once finished)
-docker build .. -t codeql-jdk:11-linux --build-arg BOOT_JDK_VERSION=11
+docker build .. -t codeql-jdk:11-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1+1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz
 docker container run --rm --name "codeql-jdk-11-linux-db-build" --mount type=bind,source="$(pwd)/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:11-linux --jdk-git-repo https://github.com/openjdk/jdk11u --jdk-version-name 11-linux "$@"

jdk-versions/jdk-17-linux.cmd

@@ -2,4 +2,4 @@
 IF NOT EXIST "databases/" mkdir databases || EXIT 1
 
 @REM Build image, then start container (with `--rm` to remove it once finished)
-docker build .. -t codeql-jdk:17-linux --build-arg BOOT_JDK_VERSION=16 && docker container run --rm --name "codeql-jdk-17-linux-db-build" --mount type=bind,source="%cd%/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:17-linux --jdk-git-repo https://github.com/openjdk/jdk17u --jdk-version-name 17-linux %*
+docker build .. -t codeql-jdk:17-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1+1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz && docker container run --rm --name "codeql-jdk-17-linux-db-build" --mount type=bind,source="%cd%/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:17-linux --jdk-git-repo https://github.com/openjdk/jdk17u --jdk-version-name 17-linux %*

jdk-versions/jdk-17-linux.sh

@@ -4,5 +4,5 @@ set -e
 # Create output directory
 mkdir -p databases
 # Build image, then start container (with `--rm` to remove it once finished)
-docker build .. -t codeql-jdk:17-linux --build-arg BOOT_JDK_VERSION=16
+docker build .. -t codeql-jdk:17-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1+1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz
 docker container run --rm --name "codeql-jdk-17-linux-db-build" --mount type=bind,source="$(pwd)/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:17-linux --jdk-git-repo https://github.com/openjdk/jdk17u --jdk-version-name 17-linux "$@"

jdk-versions/jdk-8-linux.cmd

@@ -5,4 +5,5 @@ IF NOT EXIST "databases/" mkdir databases || EXIT 1
 @REM Note: https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html#bootjdk says JDK 7 should
 @REM be used as boot JDK, but using JDK 8 seems to work as well
 @REM Uses Adoptium repository because https://github.com/openjdk/jdk8u is not updated anymore
-docker build .. -t codeql-jdk:8-linux --build-arg BOOT_JDK_VERSION=8 && docker container run --rm --name "codeql-jdk-8-linux-db-build" --mount type=bind,source="%cd%/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:8-linux --jdk-git-repo https://github.com/adoptium/jdk8u --make-target all --jdk-version-name 8-linux %*
+@REM EDIT: Apparently openjdk/jdk8u is updated again?
+docker build .. -t codeql-jdk:8-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz && docker container run --rm --name "codeql-jdk-8-linux-db-build" --mount type=bind,source="%cd%/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:8-linux --jdk-git-repo https://github.com/adoptium/jdk8u --make-target all --jdk-version-name 8-linux %*

jdk-versions/jdk-8-linux.sh

@@ -6,6 +6,7 @@ mkdir -p databases
 # Build image, then start container (with `--rm` to remove it once finished)
 # Note: https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html#bootjdk says JDK 7 should
 # be used as boot JDK, but using JDK 8 seems to work as well
-docker build .. -t codeql-jdk:8-linux --build-arg BOOT_JDK_VERSION=8
+docker build .. -t codeql-jdk:8-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz
 # Uses Adoptium repository because https://github.com/openjdk/jdk8u is not updated anymore
+# EDIT: Apparently openjdk/jdk8u is updated again?
 docker container run --rm --name "codeql-jdk-8-linux-db-build" --mount type=bind,source="$(pwd)/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:8-linux --jdk-git-repo https://github.com/adoptium/jdk8u --make-target all --jdk-version-name 8-linux "$@"

jdk-versions/jdk-latest(19)-linux.cmd

@@ -2,4 +2,4 @@
 IF NOT EXIST "databases/" mkdir databases || EXIT 1
 
 @REM Build image, then start container (with `--rm` to remove it once finished)
-docker build .. -t codeql-jdk:19-linux --build-arg BOOT_JDK_VERSION=18 && docker container run --rm --name "codeql-jdk-19-linux-db-build" --mount type=bind,source="%cd%/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:19-linux --jdk-git-repo https://github.com/openjdk/jdk19u --jdk-version-name 19-linux %*
+docker build .. -t codeql-jdk:19-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1+1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz && docker container run --rm --name "codeql-jdk-19-linux-db-build" --mount type=bind,source="%cd%/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:19-linux --jdk-git-repo https://github.com/openjdk/jdk19u --jdk-version-name 19-linux %*

jdk-versions/jdk-latest(19)-linux.sh

@@ -4,5 +4,5 @@ set -e
 # Create output directory
 mkdir -p databases
 # Build image, then start container (with `--rm` to remove it once finished)
-docker build .. -t codeql-jdk:19-linux --build-arg BOOT_JDK_VERSION=18
+docker build .. -t codeql-jdk:19-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1+1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz
 docker container run --rm --name "codeql-jdk-19-linux-db-build" --mount type=bind,source="$(pwd)/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:19-linux --jdk-git-repo https://github.com/openjdk/jdk19u --jdk-version-name 19-linux "$@"