From d0cc2c841650148fcd2023b4cf7f2be2f0d8b13d Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon.beijer@cybercom.com>
Date: Tue, 25 Jun 2019 17:22:52 +0200
Subject: [PATCH] Test to separate the main with the common

---
 Dockerfile => common.docker | 10 ++++------
 dependencies/toolchains     |  2 +-
 m68k-amigaos/Dockerfile     |  8 ++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename Dockerfile => common.docker (72%)
 create mode 100644 m68k-amigaos/Dockerfile

diff --git a/Dockerfile b/common.docker
similarity index 72%
rename from Dockerfile
rename to common.docker
index f77a29b..17177ec 100644
--- a/Dockerfile
+++ b/common.docker
@@ -1,10 +1,8 @@
-FROM sebastianbergmann/amiga-gcc:latest
 MAINTAINER Marlon Beijer "marlon@amigadev.com"
 
 RUN apt-get update && apt-get install -y apt-utils cmake wget git make
 RUN echo "root:root" | chpasswd
 
-ENV CROSS_PFX m68k-amigaos
 ENV CROSS_ROOT /opt/${CROSS_PFX}
 
 # Temporary fix
@@ -13,9 +11,9 @@ RUN rm /opt/${CROSS_PFX} ; ln -s /opt/amiga /opt/${CROSS_PFX}
 WORKDIR /work
 ENTRYPOINT ["/entry/entrypoint.sh"]
 
-COPY imagefiles/cmake.sh /usr/local/bin/cmake
-COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
-COPY imagefiles/entrypoint.sh /entry/
+COPY ../imagefiles/cmake.sh /usr/local/bin/cmake
+COPY ../imagefiles/ccmake.sh /usr/local/bin/ccmake
+COPY ../imagefiles/entrypoint.sh /entry/
 
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
@@ -25,6 +23,6 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
     CXX=${CROSS_ROOT}/bin/${CROSS_PFX}-g++ \
 	RANLIB=${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib
 	
-COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
+COPY ../dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
 ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr 
\ No newline at end of file
diff --git a/dependencies/toolchains b/dependencies/toolchains
index cca36cc..06efb3b 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit cca36cc5af8918f9e3b6412d6e8d46ba4c4e8bd6
+Subproject commit 06efb3b476424ed06f192bef394d65bb26f9441e
diff --git a/m68k-amigaos/Dockerfile b/m68k-amigaos/Dockerfile
new file mode 100644
index 0000000..f9b50d8
--- /dev/null
+++ b/m68k-amigaos/Dockerfile
@@ -0,0 +1,8 @@
+FROM sebastianbergmann/amiga-gcc:latest
+
+ENV CROSS_PFX m68k-amigaos
+
+# Temporary fix
+RUN ln -s /opt/amiga /opt/${CROSS_PFX}
+
+#include "../common.docker"