Skip to content

Commit

Permalink
Add MC, add back remote-docker
Browse files Browse the repository at this point in the history
  • Loading branch information
joshhsoj1902 committed Oct 8, 2023
1 parent 5f20156 commit fab8863
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1

define: &images [gmod-base]
define: &images [gmod-base, minecraft-base]

executors:
docker-publisher:
Expand Down Expand Up @@ -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
Expand All @@ -57,7 +57,7 @@ jobs:
executor: docker-publisher
steps:
- checkout
# - setup_remote_docker
- setup_remote_docker
- run:
name: "Pull image"
command: |
Expand Down
26 changes: 26 additions & 0 deletions images/minecraft-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit fab8863

Please sign in to comment.