From 03a73a00f3d1455a43d42a0fe57ed203c258efaa Mon Sep 17 00:00:00 2001
From: Kiritow <1362050620@qq.com>
Date: Sat, 20 Feb 2021 07:03:11 +0800
Subject: [PATCH] Update factorio image

---
 mcsm-factorio-base/.gitignore   |  2 --
 mcsm-factorio-base/Dockerfile   | 14 +++++++++++++-
 mcsm-factorio-base/Readme.md    |  3 +--
 mcsm-factorio-base/bootstrap.sh |  6 ------
 4 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 mcsm-factorio-base/.gitignore
 delete mode 100755 mcsm-factorio-base/bootstrap.sh

diff --git a/mcsm-factorio-base/.gitignore b/mcsm-factorio-base/.gitignore
deleted file mode 100644
index 0e9e561..0000000
--- a/mcsm-factorio-base/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-temp/
-
diff --git a/mcsm-factorio-base/Dockerfile b/mcsm-factorio-base/Dockerfile
index 77757e0..00b3a12 100644
--- a/mcsm-factorio-base/Dockerfile
+++ b/mcsm-factorio-base/Dockerfile
@@ -1,3 +1,15 @@
+# Stage 0
+FROM ubuntu-cn:latest
+RUN apt update \
+    && apt install -y curl xz-utils \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /tmp/* /var/tmp/*
+RUN cd /root \
+    && curl -vL https://factorio.com/get-download/stable/headless/linux64 -o factorio_headless_x64_latest_stable.tar.xz \
+    && mkdir factorio \
+    && tar --strip-components=1 -xJvf factorio_headless_x64_latest_stable.tar.xz -C factorio
+
+# Stage 1
 FROM mcsm-base:latest
 COPY ./bg.jpg /opt/MCSManager/public/login/static/
-COPY ./temp/factorio /opt/factorio
+COPY --from=0 /root/factorio /opt/factorio
diff --git a/mcsm-factorio-base/Readme.md b/mcsm-factorio-base/Readme.md
index 5865b82..fa4451b 100644
--- a/mcsm-factorio-base/Readme.md
+++ b/mcsm-factorio-base/Readme.md
@@ -1,4 +1,3 @@
 # mcsm-factorio-base
 
-`bootstrap.sh` will download latest factorio headless server. Run it first.
-
+[Factorio](https://factorio.com/) latest headless server, bundled with [MCSManager](https://github.com/Suwings/MCSManager).
diff --git a/mcsm-factorio-base/bootstrap.sh b/mcsm-factorio-base/bootstrap.sh
deleted file mode 100755
index 577d30e..0000000
--- a/mcsm-factorio-base/bootstrap.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-mkdir -p temp
-cd temp
-wget https://factorio.com/get-download/stable/headless/linux64 -O factorio_headless_x64_latest_stable.tar.xz
-mkdir -p factorio
-tar --strip-components=1 -xJvf factorio_headless_x64_latest_stable.tar.xz -C factorio
-