From 05248d2b82ab89d483b65703f8d95469de311eb4 Mon Sep 17 00:00:00 2001
From: William Billingsley <wbilling@une.edu.au>
Date: Wed, 10 Jul 2024 15:23:49 +1000
Subject: [PATCH] Update Dockerfile and add toolchain download
This commit updates the Dockerfile to use JDK21 and adds configuration
to auto-download a JDK.
The Dockerfile needs to be updated to JDK21 because the autodownload
cannot find a JDK21 for Ubuntu on M1 Macs (so needs to use one set
up in the Docker image) for tutorial 3
---
.devcontainer/Dockerfile | 2 +-
settings.gradle | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index f020093..684982d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim-bullseye
+FROM openjdk:21-jdk-slim-bullseye
# Install some basic development utilities
RUN apt-get update && apt-get install -y \
diff --git a/settings.gradle b/settings.gradle
index c6b655d..3b32e8c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,5 +4,9 @@ pluginManagement {
}
}
+plugins {
+ id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
rootProject.name = 'dotsAndBoxes'
--
GitLab