tlaternet/tlaternet-server
1
0
Fork 0
Code Issues 9 Pull requests Releases Activity

Use a full entrypoint instead of a runAsRoot script for minecraft #14

Merged
tlater merged 1 commit from tlater/minecraft-entrypoint into master 2020-07-27 18:07:39 +01:00
Conversation 0 Commits 1 Files changed 1 +9 -6
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c434f513cd - Show all commits

15
etc/nixos/services/minecraft.nix
View file

@ -1,6 +1,14 @@
{ pkgs, ... }: { pkgs, ... }:
let let
entrypoint = pkgs.writeScript "entrypoint.sh" ''
#!${pkgs.bash}/bin/bash
${pkgs.busybox}/bin/mkdir -p /var/lib/
${pkgs.gzip}/bin/gzip -dc ${./configs/minecraft.tar.gz} | ${pkgs.gnutar}/bin/tar -xf - -C /var/lib
echo 'eula=true' > /var/lib/minecraft/eula.txt
cp -f ${properties} /var/lib/minecraft
$@
'';
ops = pkgs.writeText "ops.json" (builtins.toJSON [ ops = pkgs.writeText "ops.json" (builtins.toJSON [
{ {
uuid = "140d177a-966f-41b8-a4c0-e305babd291b"; uuid = "140d177a-966f-41b8-a4c0-e305babd291b";
@ -72,13 +80,8 @@ in
imageFile = pkgs.dockerTools.buildImage { imageFile = pkgs.dockerTools.buildImage {
name = "tlaternet/minecraft"; name = "tlaternet/minecraft";
tag = "latest"; tag = "latest";
runAsRoot = ''
mkdir -p /var/lib/
${pkgs.gzip}/bin/gzip -dc ${./configs/minecraft.tar.gz} | ${pkgs.gnutar}/bin/tar -xf - -C /var/lib
echo 'eula=true' > /var/lib/minecraft/eula.txt
cp -f ${properties} /var/lib/minecraft
'';
config = { config = {
Entrypoint = [ "${entrypoint}" ];
Cmd = [ "${pkgs.jre_headless}/bin/java" Cmd = [ "${pkgs.jre_headless}/bin/java"
"-Xms2G" "-Xms2G"
"-Xmx2G" "-Xmx2G"