From 1cb8d65615a5462c054f4b4c7ba02fbc1bb30e3d Mon Sep 17 00:00:00 2001
From: Marc Baloup <marc.baloup@laposte.net>
Date: Fri, 7 Apr 2023 11:42:09 +0200
Subject: [PATCH] Introduce new container registry

---
 Readme.md |  2 +-
 build.sh  | 13 ++++++++-----
 run.sh    |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Readme.md b/Readme.md
index 8ac551b..a0796bd 100644
--- a/Readme.md
+++ b/Readme.md
@@ -4,7 +4,7 @@ Docker Compose Example
 version: "3"
 services:
   paper:
-    image: "pandacubefr/paper:(version)"
+    image: "cr.pandacube.fr/paper:(version)"
     container_name: (server name)
     stdin_open: true # docker run -i
     tty: true        # docker run -t
diff --git a/build.sh b/build.sh
index 8cb6fb8..8781e21 100644
--- a/build.sh
+++ b/build.sh
@@ -48,13 +48,16 @@ curl -o $RUNNABLE_SERVER_JAR $DOWNLOAD_REOBF
 #find bundle/versions/ bundle/libraries/ -type f -name '*.jar' > jars.txt
 
 
-DOCKER_TAG="pandacubefr/paper:"$MC_VERSION"-"$PAPER_BUILD
+DOCKER_TAG="cr.pandacube.fr/paper:"$MC_VERSION"-"$PAPER_BUILD
 echo "Building docker image with pre-downloaded and pre-patched files, with tag "$DOCKER_TAG
-docker build --build-arg RUNNABLE_SERVER_JAR=$RUNNABLE_SERVER_JAR -t $DOCKER_TAG -f Dockerfile.paper .
+docker build --build-arg RUNNABLE_SERVER_JAR=$RUNNABLE_SERVER_JAR -t $DOCKER_TAG .
 
-DOCKER_IMAGE_FILE="Paper-docker-"$MC_VERSION"-"$PAPER_BUILD".tar.gz"
-echo "Saving docker image to "$DOCKER_IMAGE_FILE
-docker save $DOCKER_TAG | gzip > $DOCKER_IMAGE_FILE
+#DOCKER_IMAGE_FILE="Paper-docker-"$MC_VERSION"-"$PAPER_BUILD".tar.gz"
+#echo "Saving docker image to "$DOCKER_IMAGE_FILE
+#docker save $DOCKER_TAG | gzip > $DOCKER_IMAGE_FILE
+
+echo "Pushing image to Pandacube’s container registry"
+docker push $DOCKER_TAG
 
 #mkdir uberjar
 #for jar in `cat jars.txt`; do
diff --git a/run.sh b/run.sh
index d150a6d..5fef4e8 100644
--- a/run.sh
+++ b/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-java -Xmx$MAXMEM -XX:+UseG1GC -XX:+ParallelRefProcEnabled \
+exec java -Xmx$MAXMEM -XX:+UseG1GC -XX:+ParallelRefProcEnabled \
     -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions \
     -XX:G1ReservePercent=15 -XX:G1NewSizePercent=20 -XX:G1MaxNewSizePercent=30 \
     -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 \