Skip to content

Commit

Permalink
nothing changed!!!!
Browse files Browse the repository at this point in the history
  • Loading branch information
yumio7 authored Jun 28, 2024
1 parent 7f29a10 commit 15dc693
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM alpine as helper
FROM alpine AS helper
ARG KEEPUP_VERSION='3.0.0-alpha.3'
RUN wget -nv -q -O keepup.zip https://github.com/MineInAbyss/Keepup/releases/download/v${KEEPUP_VERSION}/keepup-shadow-${KEEPUP_VERSION}.zip \
# unzip file inside hocon-to-json.zip into /usr/local \
&& unzip -q keepup.zip \
&& mv keepup-shadow-${KEEPUP_VERSION}/ keepup

FROM itzg/minecraft-server:java21-graalvm as minecraft
FROM itzg/minecraft-server:java21-graalvm AS minecraft
LABEL org.opencontainers.image.authors="yumio <csaila@live.com>; DoggySazHi <reimu@williamle.com>"
LABEL org.opencontainers.image.version="v0.0.2"

Expand Down Expand Up @@ -66,7 +66,7 @@ WORKDIR /data

ENTRYPOINT ["/scripts/dev/entrypoint"]

FROM itzg/bungeecord as proxy
FROM itzg/bungeecord AS proxy
LABEL org.opencontainers.image.authors="yumio <csaila@live.com>"
LABEL org.opencontainers.image.version="v0.0.1"

Expand Down Expand Up @@ -96,7 +96,7 @@ WORKDIR /server
RUN cp /usr/bin/run-bungeecord.sh /start
ENTRYPOINT ["/scripts/dev/workaround"]

FROM itzg/minecraft-server:java21-graalvm as momoyo
FROM itzg/minecraft-server:java21-graalvm AS momoyo
LABEL org.opencontainers.image.authors="yumio <csaila@live.com>"
LABEL org.opencontainers.image.version="v1.0.0"

Expand Down
2 changes: 1 addition & 1 deletion scripts/dev/ansible
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ "$ANSIBLE" = "true" ]; then
if [ "$ANSIBLE_PULL" = "true" ]; then
echo "Pulling and running latest server config ansible playbook"

ansible-pull -U "https://${GITHUB_TOKEN}@github.com/Gensokyo-Reimagined/gensou-config.git" -u "admin" -d "/server-config" --checkout "${ANSIBLE_PULL_BRANCH:=main}"
ansible-pull -U "https://${GITHUB_TOKEN}@github.com/Gensokyo-Reimagined/gensou-config.git" -d "/server-config" --checkout "${ANSIBLE_PULL_BRANCH:=main}"
elif [ -f "/server-config/local.yml" ]; then
echo "Running local server config ansible playbook"

Expand Down

0 comments on commit 15dc693

Please sign in to comment.