diff --git a/CHANGELOG.md b/CHANGELOG.md index 75eed18..7b9570a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://git.rustybever.be/Chewing_Bever/alex/src/branch/dev) +## [0.2.2](https://git.rustybever.be/Chewing_Bever/alex/src/tag/0.2.2) + +### Fixed + +* Use correct env var for backup directory + ## [0.2.1](https://git.rustybever.be/Chewing_Bever/alex/src/tag/0.2.1) ### Added diff --git a/Cargo.lock b/Cargo.lock index e802625..3e798dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,7 +10,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "alex" -version = "0.2.1" +version = "0.2.2" dependencies = [ "chrono", "clap", diff --git a/Cargo.toml b/Cargo.toml index 43e1246..2c4045b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alex" -version = "0.2.1" +version = "0.2.2" description = "Wrapper around Minecraft server processes, designed to complement Docker image installations." authors = ["Jef Roosens"] edition = "2021" diff --git a/Dockerfile b/Dockerfile index d754728..dba2674 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ FROM eclipse-temurin:18-jre-alpine # Build arguments ARG MC_VERSION=1.19.4 -ARG PAPERMC_VERSION=545 +ARG PAPERMC_VERSION=525 RUN addgroup -Sg 1000 paper && \ adduser -SHG paper -u 1000 paper @@ -61,4 +61,5 @@ EXPOSE 25565 # Switch to non-root user USER paper:paper -ENTRYPOINT ["/bin/alex", "paper"] +ENTRYPOINT ["/bin/dumb-init", "--"] +CMD ["/bin/alex", "paper"] diff --git a/src/main.rs b/src/main.rs index 10500b3..2cd84ff 100644 --- a/src/main.rs +++ b/src/main.rs @@ -46,7 +46,7 @@ struct Cli { long, value_name = "BACKUP_DIR", default_value = "../backups", - env = "ALEX_WORLD_DIR" + env = "ALEX_BACKUP_DIR" )] backup: PathBuf, /// Java command to run the server jar with