From fab886316261a73af0f57c103b0fc77d2ac87de3 Mon Sep 17 00:00:00 2001
From: Josh <joshhsoj1902@gmail.com>
Date: Sun, 8 Oct 2023 12:55:05 -0400
Subject: [PATCH] Add MC, add back remote-docker

---
 .circleci/config.yml             |  6 +++---
 images/minecraft-base/Dockerfile | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 images/minecraft-base/Dockerfile

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 67975ce..e14e507 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 
-define: &images [gmod-base]
+define: &images [gmod-base, minecraft-base]
 
 executors:
   docker-publisher:
@@ -38,7 +38,7 @@ jobs:
     steps:
       - attach_workspace:
           at: /tmp/workspace
-      # - setup_remote_docker
+      - setup_remote_docker
       - run:
           name: Load archived Docker image
           command: docker load -i /tmp/workspace/image-<< parameters.dir >>.tar
@@ -57,7 +57,7 @@ jobs:
     executor: docker-publisher
     steps:
       - checkout
-      # - setup_remote_docker
+      - setup_remote_docker
       - run:
           name: "Pull image"
           command: |
diff --git a/images/minecraft-base/Dockerfile b/images/minecraft-base/Dockerfile
new file mode 100644
index 0000000..550c2ed
--- /dev/null
+++ b/images/minecraft-base/Dockerfile
@@ -0,0 +1,26 @@
+FROM joshhsoj1902/docker-linuxgsm-scripts:1.0.0 AS scripts
+FROM gameservermanagers/gameserver:pmc
+
+RUN apt-get update && apt-get install -y \
+    gettext-base \
+    && rm -rf /var/lib/apt/lists/*
+
+# Override entrypoint-user to support hooks
+COPY --from=scripts /entrypoint-user.sh /app/entrypoint-user.sh
+
+# Setup Layers
+COPY --from=scripts /scripts/apply-overlay.sh /app/hooks/pre-install/50-apply-overlay.sh
+COPY --from=scripts /scripts/apply-overlay.sh /app/hooks/post-install/50-apply-overlay.sh
+COPY --from=scripts /scripts/resolve-templates.sh /app/hooks/pre-install/51-resolve-templates.sh
+COPY --from=scripts /scripts/resolve-templates.sh /app/hooks/post-install/51-resolve-templates.sh
+ENV LGSM_HELPER_OVERLAY_SRC=/layers
+ENV LGSM_HELPER_OVERLAY_DEST=/data
+ENV LGSM_HELPER_TEMPLATE_EXTENSION=.overlay-template
+
+# Download Plugins
+COPY --from=scripts /scripts/minecraft-install-plugins.sh /app/hooks/post-install/52-install-plugins.sh
+## Set versions
+ENV LGSM_MINECRAFT_PLUGIN_DYNMAP_VERSION_ID=UXqPUg7D
+ENV LGSM_MINECRAFT_PLUGIN_DYNMAP_VERSION=Dynmap-3.7-beta-2-spigot.jar
+ENV LGSM_MINECRAFT_PLUGIN_ESSENTIALS_VERSION=2.20.1
+ENV LGSM_MINECRAFT_PLUGIN_UNIFIED_METRICS_VERSION=0.3.8