From dfeb4d8ce45b8669cf58207bd19ac96b2ccdd8e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?William=20S=C3=B6derberg?= <william@soderberg.tech>
Date: Mon, 20 Oct 2025 15:29:06 +0200
Subject: [PATCH] editted the java and gradle path and changed to openjdk:21

---
 build/Dockerfile | 12 +++---------
 main.tf          |  5 +++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 2c4594e..3a8106c 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,13 +1,13 @@
 FROM python:slim-bookworm AS base
 
 # Copy Java from openjdk:26-oracle
-ENV JAVA_HOME=/usr/java/openjdk-26
-COPY --from=openjdk:26-oracle $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:21 /usr/java/openjdk-21 /usr/java/openjdk-21
+ENV JAVA_HOME=/usr/java/openjdk-21
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 # Copy Gradle from gradle:latest
+COPY --from=gradle:latest /opt/gradle /opt/gradle
 ENV GRADLE_HOME=/opt/gradle
-COPY --from=gradle:latest $GRADLE_HOME $GRADLE_HOME
 ENV PATH="${GRADLE_HOME}/bin:${PATH}"
 
 # Update and install dependencies
@@ -58,18 +58,12 @@ FROM scala AS lth
 # Clears apt lists
 RUN rm -rf /var/lib/apt/lists/* 
 
-
-
 # Adds the default User
 ARG USER=lth-student
 RUN useradd --groups sudo --no-create-home --shell /bin/bash ${USER} \
 	&& echo "${USER} ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/${USER} \
 	&& chmod 0440 /etc/sudoers.d/${USER}
 
-# Create home directory and set ownership
-USER root
-RUN mkdir -p /home/${USER} && chown -R ${USER}:${USER} /home/${USER}
-
 # Sets user and work directory
 USER ${USER}
 WORKDIR /home/${USER}
\ No newline at end of file
diff --git a/main.tf b/main.tf
index 381d617..913bec2 100644
--- a/main.tf
+++ b/main.tf
@@ -164,6 +164,11 @@ resource "docker_container" "workspace" {
   # Hostname makes the shell more user friendly: coder@my-workspace:~$
   hostname = data.coder_workspace.me.name
   # Use the docker gateway if the access URL is 127.0.0.1
+  entrypoint = [
+    "sh", "-c", "chown", "-R", "${local.username}:${local.username}", "/home/${local.username}", 
+    "&&", "exec",
+    "sh", "-c", replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal")
+  ]
   entrypoint = ["sh", "-c", replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal")]
   env        = ["CODER_AGENT_TOKEN=${coder_agent.main.token}"]
   host {