From 33d966057f2fe4a9033a803e1a14347106c30195 Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Mon, 8 Apr 2024 07:30:02 +0100
Subject: [PATCH] ci

---
 .gitea/workflows/ci.yml | 6 +++---
 Dockerfile              | 8 ++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 2d16deb..2573d8f 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -14,12 +14,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - name: Set up JDK 17 and Maven
+        uses: s4u/setup-maven-action@v1.7.0
         with:
           java-version: '17'
           distribution: 'temurin'
-          cache: maven
+          maven-version: 3.8.5
 
       - name: Run Tests
         run: mvn --batch-mode test
diff --git a/Dockerfile b/Dockerfile
index 7c2cad8..6352917 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,7 @@
-FROM eclipse-temurin:17.0.10_7-jdk-focal
-
-# Install maven
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y maven
+FROM maven:3.8.5-openjdk-17-slim
 
 # Set the working directory
-WORKDIR     /home/container
+WORKDIR /home/container
 
 # Copy the current directory contents into the container at /home/container
 COPY . .