From 5ae9ae65f856b8aa4e9a3e23f89f38dc1b6e2d40 Mon Sep 17 00:00:00 2001 From: Jim C K Flaten Date: Sat, 19 Jul 2025 14:42:57 +0200 Subject: [PATCH] Remove left-overs from Maven. --- .env.example | 5 ----- .gitignore | 9 --------- Dockerfile | 20 -------------------- README.md | 8 ++------ docker-compose.yml | 11 ----------- 5 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 .env.example delete mode 100644 Dockerfile delete mode 100644 docker-compose.yml diff --git a/.env.example b/.env.example deleted file mode 100644 index b4bc403a..00000000 --- a/.env.example +++ /dev/null @@ -1,5 +0,0 @@ -# Should match the UID and GID of the project files. -# With Docker this is typically your own UID and GID. -# With Podman this is probably root's UID and GID.. -UID=1000 -GID=1000 diff --git a/.gitignore b/.gitignore index 0aba9b5a..9b902c2f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,19 +27,10 @@ replay_pid* /.idea /*.iml -# Maven output -/dependency-reduced-pom.xml -/target -/jars -/.m2 - # Gradle output /.gradle /build -# Env vars -.env - # Test server /server /folia diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 51d85a9a..00000000 --- a/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM maven:3.9.9-eclipse-temurin-22 - -# Default to first user on Debian based distros. -# Pass in your own UID and GID as environment variables to override. -ARG UID=1000 -ARG GID=1000 - -# Create a user with the same UID and GID as the host user if they don't already exist. -RUN getent group $GID || groupadd -g $GID app -RUN getent passwd $UID || useradd -m -u $UID -g $GID -s /bin/bash -d /app app - -# If an alternate user was created, let it sudo. -RUN ( getent passwd app > /dev/null && echo 'app ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers > /dev/null ) || true - -# Drop privileges. -USER $UID:$GID - -WORKDIR /app - -ENTRYPOINT [ "mvn", "-Dmaven.repo.local=/app/.m2" ] diff --git a/README.md b/README.md index ad05a20b..cce00e94 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,9 @@ Please see [our wiki](https://gitlab.com/distant-horizons-team/distant-horizons- ## Building -### Dockerized +This project uses Gradle. -If you have Docker; run `docker compose up` to build the project inside a container. See `.env.example` if you need to adjust the user/group of the build process. - -### Using Maven directly - -Just run `mvn` in the project directory to compile and package a new JAR. +`gradlew clean build` ## Contribution diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index a536caca..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - maven: - build: - context: . - - args: - UID: ${UID} - GID: ${GID} - - volumes: - - ./:/app