Update docker images with jtreg7, and python3-setuptools

typetools · Jun 20, 2024 · 5a68e14 · 5a68e14
1 parent aeecbf8
commit 5a68e14
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 21 deletions.
diff --git a/checker/bin-devel/Dockerfile-README b/checker/bin-devel/Dockerfile-README
@@ -17,6 +17,8 @@ Preliminaries:
 
 Create the Docker image:
 
+# Warning: when run in an Emacs shell buffer, this creates huge amounts of output.
+# So, probably run it in a terminal.
 # Alias to create the Docker image, in an empty directory, and upload to Docker Hub.
 # Takes about 12 minutes for jdk*, about 1 hour for jdk*-plus.
 DOCKERTESTING=""

diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk11 b/checker/bin-devel/Dockerfile-ubuntu-jdk11
@@ -32,12 +32,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   cpp \
   git \
   jq \
-  jtreg6 \
+  jtreg7 \
   libcurl3-gnutls \
   make \
   maven \
-  python3-distutils \
   python3-requests \
+  python3-setuptools \
   unzip \
   wget
 

diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk11-plus b/checker/bin-devel/Dockerfile-ubuntu-jdk11-plus
@@ -32,12 +32,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   cpp \
   git \
   jq \
-  jtreg6 \
+  jtreg7 \
   libcurl3-gnutls \
   make \
   maven \
-  python3-distutils \
   python3-requests \
+  python3-setuptools \
   unzip \
   wget
 

diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk17 b/checker/bin-devel/Dockerfile-ubuntu-jdk17
@@ -30,12 +30,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   cpp \
   git \
   jq \
-  jtreg6 \
+  jtreg7 \
   libcurl3-gnutls \
   make \
   maven \
-  python3-distutils \
   python3-requests \
+  python3-setuptools \
   unzip \
   wget
 

diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk17-plus b/checker/bin-devel/Dockerfile-ubuntu-jdk17-plus
@@ -30,12 +30,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   cpp \
   git \
   jq \
-  jtreg6 \
+  jtreg7 \
   libcurl3-gnutls \
   make \
   maven \
-  python3-distutils \
   python3-requests \
+  python3-setuptools \
   unzip \
   wget
 

diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk20 b/checker/bin-devel/Dockerfile-ubuntu-jdk20
@@ -6,7 +6,8 @@
 # Checker Framework and Annotation Tools repositories) for: (java|jdk).?20\b
 
 # "ubuntu" is the latest LTS release.  "ubuntu:rolling" is the latest release.
-FROM ubuntu:rolling
+# Ubuntu 23.10 contains the package "openjdk-20-jdk".
+FROM ubuntu:23.10
 MAINTAINER Michael Ernst <mernst@cs.washington.edu>
 
 # According to
@@ -42,12 +43,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   libcurl3-gnutls \
   make \
   maven \
-  python3-distutils \
   python3-requests \
+  python3-setuptools \
   unzip \
   wget \
 && aptitude -y install \
-  jtreg6
+  jtreg7
 
 # Maven 3.8.7 is the default on Ubuntu 23.04, so the below is not needed.
 # (Don't try to use a variable here for the Maven version.)

diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk20-plus b/checker/bin-devel/Dockerfile-ubuntu-jdk20-plus
@@ -6,7 +6,8 @@
 # Checker Framework and Annotation Tools repositories) for: (java|jdk).?20\b
 
 # "ubuntu" is the latest LTS release.  "ubuntu:rolling" is the latest release.
-FROM ubuntu:rolling
+# Ubuntu 23.10 contains the package "openjdk-20-jdk".
+FROM ubuntu:23.10
 MAINTAINER Michael Ernst <mernst@cs.washington.edu>
 
 # According to
@@ -42,12 +43,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   libcurl3-gnutls \
   make \
   maven \
-  python3-distutils \
   python3-requests \
+  python3-setuptools \
   unzip \
   wget \
 && aptitude -y install \
-  jtreg6
+  jtreg7
 
 # Maven 3.8.7 is the default on Ubuntu 23.04, so the below is not needed.
 # (Don't try to use a variable here for the Maven version.)

diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk21 b/checker/bin-devel/Dockerfile-ubuntu-jdk21
@@ -39,12 +39,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   libcurl3-gnutls \
   make \
   maven \
-  python3-distutils \
   python3-requests \
+  python3-setuptools \
   unzip \
   wget \
 && aptitude -y install \
-  jtreg6
+  jtreg7
 
 # Maven 3.8.7 is the default on Ubuntu 23.04, so the below is not needed.
 # (Don't try to use a variable here for the Maven version.)

diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk21-plus b/checker/bin-devel/Dockerfile-ubuntu-jdk21-plus
@@ -41,12 +41,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   libcurl3-gnutls \
   make \
   maven \
-  python3-distutils \
   python3-requests \
+  python3-setuptools \
   unzip \
   wget \
 && aptitude -y install \
-  jtreg6
+  jtreg7
 
 # Maven 3.8.7 is the default on Ubuntu 23.04, so the below is not needed.
 # (Don't try to use a variable here for the Maven version.)

diff --git a/docs/manual/troubleshooting.tex b/docs/manual/troubleshooting.tex
@@ -731,9 +731,9 @@
 sudo apt-get -qqy update
 sudo apt-get -qqy install \
  openjdk-17-jdk \
- ant cpp git gradle jq jtreg6 libcurl3-gnutls \
- make maven pipx python3-requests unzip wget \
- autoconf devscripts dia hevea imagemagick junit jtreg6 latexmk \
+ ant cpp git gradle jq jtreg7 libcurl3-gnutls \
+ make maven pipx python3-requests python3-setuptools unzip wget \
+ autoconf devscripts dia hevea imagemagick junit jtreg7 latexmk \
  librsvg2-bin libasound2-dev libcups2-dev libfontconfig1-dev \
  libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev \
  pdf2svg rsync shellcheck \