From a68832f68c0aee0b326d041257e08a53e8d13b00 Mon Sep 17 00:00:00 2001
From: askiiart <dev@askiiart.net>
Date: Wed, 6 Sep 2023 15:01:08 -0500
Subject: [PATCH] Re-add docker patch

---
 .drone.yml        | 1 +
 build-and-push.sh | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c6c2ec2..b53cbbf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,6 +5,7 @@ steps:
 - name: Make semi-static build with pyinstaller (NOT actually static)
   image: python:latest
   commands:
+  - git apply docker.patch
   - apt-get update
   - apt-get install binutils -y
   - pip install pyinstaller
diff --git a/build-and-push.sh b/build-and-push.sh
index 2a4ee36..c6c1765 100755
--- a/build-and-push.sh
+++ b/build-and-push.sh
@@ -4,11 +4,12 @@ ORG="askiiart"
 NAME="discord-always-dungeons"
 
 # Apply patch for Docker
-docker run -v .:/repo python /bin/sh -c "cd /repo && pip install -r requirements.txt && apt-get update && apt-get install binutils -y && pip install pyinstaller && pyinstaller main.py && cd /repo/dist/main && chmod -R 777 /repo/dist/main && tar cvfz /repo/AlwaysDungeons.tar.gz *"
+git apply docker.patch
 
 # Build image
-#ID=$(docker build . -q)
+docker run -v .:/repo python /bin/sh -c "cd /repo && pip install -r requirements.txt && apt-get update && apt-get install binutils -y && pip install pyinstaller && pyinstaller main.py && cd /repo/dist/main && chmod -R 777 /repo/dist/main && tar cvfz /repo/AlwaysDungeons.tar.gz *"
+ID=$(docker build . -q)
 
 # Could just do -t on the build, but this makes it easier to expand if needed.
-#docker tag ${ID} ${ORG}/${NAME}:latest
-#docker push ${ORG}/${NAME}:latest
+docker tag ${ID} ${ORG}/${NAME}:latest
+docker push ${ORG}/${NAME}:latest