Skip to content

Commit

Permalink
the return of momoyo
Browse files Browse the repository at this point in the history
  • Loading branch information
yumio7 authored Jun 4, 2024
1 parent 517a781 commit e33d8b4
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 123 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ jobs:
dockerfile: Dockerfile
target: proxy
platforms: linux/amd64
# - image: ignite
# dockerfile: ignite.Dockerfile
# platforms: linux/amd64
# - image: momoyo
# dockerfile: momoyo.Dockerfile
# platforms: linux/amd64
- image: momoyo
dockerfile: Dockerfile
target: momoyo
platforms: linux/amd64,linux/arm64
steps:
- uses: actions/checkout@v3

Expand Down
61 changes: 61 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,64 @@ WORKDIR /server

RUN cp /usr/bin/run-bungeecord.sh /start
ENTRYPOINT ["/scripts/dev/workaround"]

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"

RUN dnf reinstall glibc-common -yq
RUN dnf install glibc-langpack-en glibc-locale-source rclone wget unzip jq python3-pip -yq
# ansible ansible-collection-community-general ansible-collection-ansible-posix might be out of date? Use pip
# CHAT WE'RE INSTALLING RUST??

# Install Rust for Ansible

RUN dnf install cmake gcc make curl clang openssl-devel python3-devel -yq
RUN dnf module install python39 -yq
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}"

# Actually install Ansible

RUN python3.9 -m pip install --user setuptools-rust
RUN python3.9 -m pip install --user ansible
ENV PATH="/root/.local/bin:${PATH}"
# Should be already up-to-date
# RUN ansible-galaxy collection install community.general
# RUN ansible-galaxy collection install ansible.posix

# Clean up build dependencies

RUN dnf remove cmake gcc make clang openssl-devel python3-devel -yq

# Set locale

RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
RUN echo "LANG=en_US.UTF-8" > /etc/locale.conf
ENV LANG en_US.UTF-8

COPY --from=helper /keepup /usr/local

ENV\
KEEPUP=false\
KEEPUP_ALLOW_OVERRIDES=true\
ANSIBLE=true\
ANSIBLE_PULL=true\
ANSIBLE_PULL_BRANCH=master\
UPDATE_DATA_OWNER=true\
SERVER_NAME=dev\
ANSIBLE_HOME=/data

# Copy over scripts
COPY scripts/dev /scripts/dev
RUN chmod +x /scripts/dev/*
RUN dos2unix /scripts/dev/*

# Symlink for rclone after Ansible
RUN mkdir -p ~/.config/rclone
RUN ln -s /data/.config/rclone/rclone.conf ~/.config/rclone/rclone.conf

WORKDIR /data

ENTRYPOINT ["/scripts/dev/entrypoint"]
71 changes: 0 additions & 71 deletions ignite.Dockerfile

This file was deleted.

46 changes: 0 additions & 46 deletions momoyo.Dockerfile

This file was deleted.

0 comments on commit e33d8b4

Please sign in to comment.