From d8a875f5d00b0884771b0785c524fd5250cd0bd1 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sun, 27 Feb 2022 01:54:07 +0000
Subject: [PATCH 1/2] Rebase from Alpine back to ubuntu

This makes me really sad but is necessary for bedrock support.
Bedrock is compiled for a different libc than alpine has. #sadifus
---
 Dockerfile | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7ccd0879..cb081b62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,17 @@
-FROM python:alpine
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND="noninteractive"
 
 LABEL maintainer="Dockerfile created by Zedifus <https://gitlab.com/zedifus>"
 
 # Security Patch for CVE-2021-44228
 ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true
 
-# Install Packages, Build Dependencies & Garbage Collect & Harden
-#        (Alpine Edge repo is needed because jre16 is new)
+# Install Packages And Dependencies
 COPY requirements.txt /commander/requirements.txt
-RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/latest-stable/community \
-gcc musl-dev libffi-dev make rust cargo openssl-dev llvm11-libs \
-openjdk8-jre-base openjdk11-jre-headless openjdk16-jre-headless openjdk17-jre-headless mariadb-dev \
-&& pip3 install --no-cache-dir -r /commander/requirements.txt \
-&& apk del --no-cache gcc musl-dev libffi-dev make rust cargo openssl-dev llvm11-libs \
-&& rm -rf /sbin/apk \
-&& rm -rf /etc/apk \
-&& rm -rf /lib/apk \
-&& rm -rf /usr/share/apk \
-&& rm -rf /var/lib/apk
+RUN apt update \
+&& apt install -y gcc python3 python3-pip libmariadb-dev openjdk-8-jre-headless openjdk-11-jre-headless openjdk-16-jre-headless openjdk-17-jre-headless default-jre \
+&& pip3 install --no-cache-dir -r /commander/requirements.txt
 
 # Copy Source & copy default config from image
 COPY ./ /commander

From c409efbe28fd95d8fc5a786bb36222c33223b3d0 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sun, 27 Feb 2022 01:57:54 +0000
Subject: [PATCH 2/2] Add server imports mount

To get foreign zips/servers into crafty...
(Better than I'm going to import servers into servers)
---
 docker-compose.yml.example | 1 +
 docker/docker-compose.yml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docker-compose.yml.example b/docker-compose.yml.example
index d09e101b..de5700f1 100644
--- a/docker-compose.yml.example
+++ b/docker-compose.yml.example
@@ -15,3 +15,4 @@ services:
       - ./docker/logs:/commander/logs
       - ./docker/servers:/commander/servers
       - ./docker/config:/commander/app/config
+      - ./import:/commander/import
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f4b0f375..5e751d30 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -15,3 +15,4 @@ services:
       - ./logs:/commander/logs
       - ./servers:/commander/servers
       - ./config:/commander/app/config
+      - ./import:/commander/import