count down from 3 instead of 5

.drone.yml

@@ -24,8 +24,8 @@ steps:
 - name: notify
   image: appleboy/drone-discord
   settings:
-    avatar_url: https://files.nephatrine.net/Images/Buttons/Drone.png
-    message: "Automated build of **{{repo.name}}:{{commit.branch}}** has returned [{{build.status}}]({{build.link}})."
+    avatar_url: https://nephatrine.net/images/buttons/drone-ci.png
+    message: "Build of **[{{repo.name}}:{{commit.branch}}](<https://code.nephatrine.net/nephatrine/{{repo.name}}/src/branch/{{commit.branch}}>)** returned [{{build.status}}](<{{build.link}}>)."
     username: DroneCI
     webhook_id:
       from_secret: wh-minecraft-id
@@ -42,6 +42,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 2379a3a4f13192dd160e1a104185bd49b76b79e82d8ab0c1b3cce42cd77cedc4
+hmac: de523a0f816def70d9b83189674f2fcf596148ff6ecf24cd781c7bdbeb13c80d
 
 ...

.gitignore

@@ -1,2 +1,2 @@
-fix-perms.sh
+sign-build.sh
 test-build.sh

Dockerfile

@@ -10,5 +10,4 @@ RUN echo "====== INSTALL PACKAGES ======" \
  && rm -rf /var/cache/apk/*
 
 COPY override /
-
-EXPOSE 25565/tcp
+EXPOSE 25565/tcp

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright © 2019 Daniel Wolf <<nephatrine@gmail.com>>
+Copyright © 2021 Daniel Wolf <<nephatrine@gmail.com>>
 
 **Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -10,4 +10,4 @@ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

README.md

@@ -1,4 +1,4 @@
-[Git](https://code.nephatrine.net/nephatrine/docker-minecraft-mcu) |
+[Git](https://code.nephatrine.net/nephatrine/docker-minecraft-mcu/src/branch/master) |
 [Docker](https://hub.docker.com/r/nephatrine/minecraft-mcu/) |
 [unRAID](https://code.nephatrine.net/nephatrine/unraid-containers)
 
@@ -12,6 +12,9 @@ Edition server and optionally MCUpdater modpack.
 **YOU WILL NEED TO USE A SEPARATE REVERSE PROXY SERVER TO SECURE THIS SERVICE.
 FOR INSTANCE, AN [NGINX](https://nginx.com/) REVERSE PROXY CONTAINER.**
 
+- [Alpine Linux](https://alpinelinux.org/)
+- [Skarnet Software](https://skarnet.org/software/)
+- [S6 Overlay](https://github.com/just-containers/s6-overlay)
 - [Minecraft](https://minecraft.net/)
 - [MCUpdater](https://mcupdater.com/)
 

override/etc/cont-finish.d/00-minecraft

@@ -2,16 +2,12 @@
 if pgrep -f minedock >/dev/null; then
   s6-setuidgid guardian screen -S minedock -X stuff "`echo -ne \"say MINECRAFT SERVER SHUTTING DOWN!\r\"`"
   s6-setuidgid guardian screen -S minedock -X stuff "`echo -ne \"save-all\r\"`"
-  s6-setuidgid guardian screen -S minedock -X stuff "`echo -ne \"say 5...\r\"`"
-  sleep 1
-  s6-setuidgid guardian screen -S minedock -X stuff "`echo -ne \"say 4...\r\"`"
-  sleep 1
   s6-setuidgid guardian screen -S minedock -X stuff "`echo -ne \"say 3...\r\"`"
-  sleep 1
+  sleep 2
   s6-setuidgid guardian screen -S minedock -X stuff "`echo -ne \"say 2...\r\"`"
-  sleep 1
+  sleep 2
   s6-setuidgid guardian screen -S minedock -X stuff "`echo -ne \"say 1...\r\"`"
-  sleep 1
+  sleep 2
   s6-setuidgid guardian screen -S minedock -X stuff "`echo -ne \"stop\r\"`"
   sleep 2
-fi
+fi

override/etc/cont-init.d/02-minecraft

@@ -90,6 +90,9 @@ fi
 
 # === Download MCUpdater ===
 
+if [[ -e /mnt/config/bin/MCU-FastPack-latest.jar ]]; then
+  find /mnt/config/www/minecraft/MCU-FastPack-latest.jar -mtime +7 -delete
+fi
 if [[ ! -e /mnt/config/bin/MCU-FastPack-latest.jar ]]; then
   if [[ ! -d /mnt/config/bin ]]; then
     s6-setuidgid guardian mkdir -p /mnt/config/bin
@@ -97,6 +100,9 @@ if [[ ! -e /mnt/config/bin/MCU-FastPack-latest.jar ]]; then
   s6-setuidgid guardian wget -P /mnt/config/bin "https://files.mcupdater.com/MCU-FastPack-latest.jar"
 fi
 
+if [[ -e /mnt/config/www/minecraft/MCUpdater-latest.jar ]]; then
+  find /mnt/config/www/minecraft/MCUpdater-latest.jar -mtime +7 -delete
+fi
 if [[ ! -e /mnt/config/www/minecraft/MCUpdater-latest.jar ]]; then
   if [[ ! -d /mnt/config/www/minecraft ]]; then
     s6-setuidgid guardian mkdir -p /mnt/config/www/minecraft
@@ -257,4 +263,4 @@ if [[ ! -z "${MINECRAFT_VERSION}" ]]; then
   sed -i "s/yarn=latest/yarn=${YARN_VERSION}/g" /mnt/config/www/minecraft/modpack.xml
   sed -i "s/depends=\"cloth-config\"/depends=\"\"/g" /mnt/config/www/minecraft/modpack.xml
   sed -i 's/+/%2B/g' /mnt/config/www/minecraft/modpack.xml
-fi
+fi