.envrc

@@ -1 +0,0 @@
-use flake

.github/workflows/ci.yml

@@ -81,22 +81,12 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-      - name: Set up QEMU
+      - name: Build Docker image
-        uses: docker/setup-qemu-action@v1
+        run: |
-        with:
+          docker build . --file Dockerfile --tag ghcr.io/nicolaschan/minecraft-backup:${GITHUB_REF#refs/*/} --tag ghcr.io/nicolaschan/minecraft-backup:latest
-          platforms: all
+      - name: Publish Docker image
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          version: latest
-      - name: ghcr.io login
         run: |
           echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-      - name: Run Buildx
+          docker push ghcr.io/nicolaschan/minecraft-backup:${GITHUB_REF#refs/*/}
-        run: |
+          docker push ghcr.io/nicolaschan/minecraft-backup:latest
-          docker buildx build \
+
-          --pull \
-          --push \
-          --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 \
-          --tag ghcr.io/nicolaschan/minecraft-backup:${GITHUB_REF#refs/*/} \
-          --tag ghcr.io/nicolaschan/minecraft-backup:latest .

.gitignore

@@ -1,2 +1 @@
 coverage
-.direnv

Dockerfile

@@ -1,10 +1,10 @@
 FROM alpine
 
-LABEL org.opencontainers.image.source=https://forgejo.nevy.xyz/nev/minecraft-backup
+LABEL org.opencontainers.image.source=https://github.com/nicolaschan/minecraft-backup
 
-RUN apk add bash coreutils xxd restic util-linux openssh rclone
+RUN apk add bash coreutils xxd restic util-linux openssh
 
 WORKDIR /code
 COPY ./backup.sh .
 
-ENTRYPOINT ["/bin/sh", "-c"]
+ENTRYPOINT ["/code/backup.sh"]

README.md

@@ -44,9 +44,6 @@ docker run \
   -v /home/user/server/world:/mnt/server \
   -v /mnt/storage/backups:/mnt/backups \
   ghcr.io/nicolaschan/minecraft-backup -c -i /mnt/server -o /mnt/backups -s server-host:25575:secret -w rcon
-  
-# Using itzg/docker-minecraft-server container and rcon cli
-./backup.sh -c -i /home/user/server/world -o /mnt/storage/backups -s container-name -w docker-rcon
 ```
 
 This will show chat messages (`-c`) and save a backup of `/home/user/server/world` into `/mnt/storage/backups` using the default thinning deletion policy for old backups.
@@ -67,7 +64,7 @@ Command line options:
 -p    Prefix that shows in Minecraft chat (default: Backup)
 -q    Suppress warnings
 -r    Restic repo name (if using restic)
--s    Screen name, tmux session name, hostname:port:password for RCON or [container name](https://github.com/itzg/docker-minecraft-server) for docker-rcon
+-s    Screen name, tmux session name, or hostname:port:password for RCON
 -t    Enable lock file (lock file not used by default)
 -u    Lock file timeout seconds (empty = unlimited)
 -v    Verbose mode

backup.sh

@@ -266,8 +266,6 @@ execute-command () {
         ;;
       "RCON"|"rcon") rcon-command "$SCREEN_NAME" "$COMMAND"
         ;;
-      "docker-rcon") docker exec "$SCREEN_NAME" rcon-cli "$COMMAND"
-        ;;
     esac
   fi
 }

flake.lock

@@ -1,61 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1725634671,
-        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,36 +0,0 @@
-{
-  description = "A flake for bash, coreutils, xxd, restic, util-linux, and openssh";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-
-  outputs = {
-    self,
-    nixpkgs,
-    flake-utils,
-  }:
-    flake-utils.lib.eachDefaultSystem (
-      system: let
-        pkgs = nixpkgs.legacyPackages.${system};
-      in {
-        devShell = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            bash
-            coreutils
-            kcov
-            vim # provides xxd
-            python3
-            python312Packages.fusepy
-            restic
-            screen
-            shellcheck
-            tmux
-            utillinux
-            openssh
-          ];
-        };
-      }
-    );
-}

test/test.sh

@@ -50,7 +50,7 @@ assert-equals-directory () {
   fi
   if [ -d "$1" ]; then
     for FILE in "$1"/*; do
-      assert-equals-directory "$FILE" "$2/${FILE##"$1"}"
+      assert-equals-directory "$FILE" "$2/${FILE##$1}"
     done
   else
     assertEquals "$(cat "$1")" "$(cat "$2")"
@@ -136,6 +136,8 @@ test-file-changed-as-read-warning () {
   assert-equals-directory "$WORLD_DIR/file3.txt" "$TEST_TMP/restored/$WORLD_DIR/file3.txt"
 }
 
+
+
 test-lock-defaults () {
   TIMESTAMP="$(date +%F_%H-%M-%S --date="2021-01-01")"
   ./backup.sh -t "$TEST_TMP/lockfile" -i "$TEST_TMP/server/world" -o "$TEST_TMP/backups" -s "$SCREEN_TMP" -f "$TIMESTAMP"
@@ -239,6 +241,7 @@ test-restic-defaults () {
   check-latest-backup-restic
 }
 
+
 test-backup-spaces-in-directory () {
   TIMESTAMP="$(date +%F_%H-%M-%S --date="2021-01-01")"
   WORLD_SPACES="$TEST_TMP/minecraft server/the world"
@@ -379,20 +382,6 @@ test-rcon-interface-not-running () {
   assertContains "$OUTPUT" "Could not connect"
 }
 
-test-docker-rcon () {
-  CONTAINER="$(docker run -d -e EULA=TRUE docker.io/itzg/minecraft-server)"
-  while ! docker exec "$CONTAINER" grep 'RCON running on 0.0.0.0:25575' /data/logs/latest.log; do
-    sleep 0.1
-  done
-  TIMESTAMP="$(date +%F_%H-%M-%S --date="2021-01-01")"
-  ./backup.sh -w docker-rcon -i "$TEST_TMP/server/world" -o "$TEST_TMP/backups" -s "$CONTAINER" -f "$TIMESTAMP"
-  OUTPUT="$(docker exec "$CONTAINER" cat /data/logs/latest.log)"
-  docker rm -f "$CONTAINER"
-  assertContains "$OUTPUT" "[Rcon: Automatic saving is now disabled]"
-  assertContains "$OUTPUT" "[Rcon: Automatic saving is now enabled]"
-  assertContains "$OUTPUT" "[Rcon: Saved the game]"
-}
-
 test-sequential-delete () {
   for i in $(seq 0 20); do
     TIMESTAMP="$(date +%F_%H-%M-%S --date="2021-01-01 +$i hour")"
@@ -524,14 +513,10 @@ test-restic-thinning-delete () {
   done
   UNEXPECTED_TIMESTAMPS=(
     "2021-01-01 00:00:00"
-    "2021-01-01 01:00:00"
-    "2021-01-01 02:00:00"
     "2021-01-02 22:00:00"
-    "2021-01-03 22:00:00"
-    "2021-01-04 00:00:00"
   )
   for TIMESTAMP in "${UNEXPECTED_TIMESTAMPS[@]}"; do
-    assertNotContains "$SNAPSHOTS" "$TIMESTAMP"
+    assertNotContains "$SNAPSHOTS" "$TIMESTAMP" 
   done
 }