From 12c61f6dd68a4fdd4938397176fc8e39a8e8eb0a Mon Sep 17 00:00:00 2001
From: Michael G <michael.gileta@gmail.com>
Date: Tue, 1 Aug 2017 10:08:03 +0200
Subject: [PATCH] Change forge version for mincraft 1.4.7 & install forge

---
 Dockerfile | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cfa8d07..1f0d05b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,25 @@
-FROM ironcraft/minecraft-server:1.10.2
+FROM ironcraft/minecraft-server:1.4.7
 MAINTAINER Xawirses <xawirses@gmail.com>
 LABEL maintainer="Xawirses <xawirses@gmail.com>"
 
-ENV MINECRAFT_VERSION 1.10.2
-ENV FORGE_VERSION 12.18.3.2422
-ENV FORGE_JAR forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-universal.jar
-ENV FORGE_URL http://files.minecraftforge.net/maven/net/minecraftforge/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar
+RUN apt update && apt install -y unzip zip
 
-RUN curl --create-dirs -sLo /minecraft/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar ${FORGE_URL} && \
-  cd /minecraft && \
-  java -jar forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar --installServer && \
-  rm -f /minecraft/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar /minecraft/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar.log
+ENV MINECRAFT_VERSION 1.4.7
+ENV MINECRAFT_NAME minecraft_server.${MINECRAFT_VERSION}
+ENV MINECRAFT_JAR ${MINECRAFT_NAME}.jar
 
-COPY entrypoint.sh /usr/bin/entrypoint.sh
-RUN chmod +x /usr/bin/entrypoint.sh
+ENV FORGE_VERSION 6.6.2.534
+ENV FORGE_NAME forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-universal
+ENV FORGE_ZIP ${FORGE_NAME}.zip
+ENV FORGE_URL http://files.minecraftforge.net/maven/net/minecraftforge/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/${FORGE_ZIP}
+RUN curl --create-dirs -sLo /minecraft/${FORGE_ZIP} ${FORGE_URL} && \
+	cd /minecraft && \
+	unzip -d /minecraft/${MINECRAFT_NAME} ${MINECRAFT_JAR}  && \
+	unzip -d /minecraft/${FORGE_NAME} ${FORGE_ZIP}  && \
+	cp -Rf ${FORGE_NAME}/* ${MINECRAFT_NAME}/ && \
+	cd /minecraft/${MINECRAFT_NAME} && \
+	jar cvmf META-INF/MANIFEST.MF /minecraft/${MINECRAFT_JAR} * && \
+	rm -Rf /minecraft/${MINECRAFT_NAME} /minecraft/${FORGE_NAME} /minecraft/${FORGE_ZIP}
 
 EXPOSE 25565