From e4dde9edf85100353b5fa6fb9b757eaa43e2de42 Mon Sep 17 00:00:00 2001
From: Louis Hampton <roastveg@hotmail.co.uk>
Date: Thu, 18 Jun 2020 00:55:16 +0100
Subject: Added Dockerfile and build script

---
 Dockerfile      | 10 ++++++++++
 arm9/Makefile   |  4 ++++
 build_docker.sh | 11 +++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 Dockerfile
 create mode 100755 build_docker.sh

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..eb664074
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM i386/alpine
+
+RUN apk update
+RUN apk add --no-cache build-base libpng-dev wine ncurses freetype
+RUN apk add binutils-arm-none-eabi --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
+
+ENV BUSYBOX 1
+WORKDIR /app
+
+CMD ["/bin/sh"]
\ No newline at end of file
diff --git a/arm9/Makefile b/arm9/Makefile
index 25999e21..71d2ef93 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -192,7 +192,11 @@ LDFLAGS = -nodead -w off -proc v5te -interworking -map closure,unused -symtab so
 ####################### Other Tools #########################
 
 # DS TOOLS
+ifndef BUSYBOX
 SHA1SUM = sha1sum --quiet
+else
+SHA1SUM = sha1sum
+endif
 JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc$(EXE)
 GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx$(EXE)
 SCANINC = $(TOOLS_DIR)/scaninc/scaninc$(EXE)
diff --git a/build_docker.sh b/build_docker.sh
new file mode 100755
index 00000000..5f72c1fb
--- /dev/null
+++ b/build_docker.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+ver="0.1"
+
+docker inspect pokediamond:$ver > /dev/null
+if [ $? = 0 ];  then
+    echo "Not rebuilding image since image exists";
+else
+    docker build -t pokediamond:$ver .
+fi
+docker run --network=none -it -v $(pwd):/app pokediamond:$ver
-- 
cgit v1.2.3


From 59f6bdfa9a7645d3e2e9d1ac0bde5af3ad77e8b2 Mon Sep 17 00:00:00 2001
From: Louis Hampton <roastveg@hotmail.co.uk>
Date: Sat, 20 Jun 2020 18:57:08 +0100
Subject: Newline

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index eb664074..76bf6176 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,4 +7,4 @@ RUN apk add binutils-arm-none-eabi --no-cache --repository http://dl-3.alpinelin
 ENV BUSYBOX 1
 WORKDIR /app
 
-CMD ["/bin/sh"]
\ No newline at end of file
+CMD ["/bin/sh"]
-- 
cgit v1.2.3


From 998591274bc26b361991d603d48c403c8e068d0b Mon Sep 17 00:00:00 2001
From: Louis Hampton <roastveg@hotmail.co.uk>
Date: Sat, 20 Jun 2020 19:57:54 +0100
Subject: Moved Docker to contrib

---
 Dockerfile                     | 10 ----------
 build_docker.sh                | 11 -----------
 contrib/docker/Dockerfile      | 10 ++++++++++
 contrib/docker/build_docker.sh | 11 +++++++++++
 4 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100755 build_docker.sh
 create mode 100644 contrib/docker/Dockerfile
 create mode 100755 contrib/docker/build_docker.sh

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 76bf6176..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM i386/alpine
-
-RUN apk update
-RUN apk add --no-cache build-base libpng-dev wine ncurses freetype
-RUN apk add binutils-arm-none-eabi --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
-
-ENV BUSYBOX 1
-WORKDIR /app
-
-CMD ["/bin/sh"]
diff --git a/build_docker.sh b/build_docker.sh
deleted file mode 100755
index 5f72c1fb..00000000
--- a/build_docker.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-ver="0.1"
-
-docker inspect pokediamond:$ver > /dev/null
-if [ $? = 0 ];  then
-    echo "Not rebuilding image since image exists";
-else
-    docker build -t pokediamond:$ver .
-fi
-docker run --network=none -it -v $(pwd):/app pokediamond:$ver
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
new file mode 100644
index 00000000..76bf6176
--- /dev/null
+++ b/contrib/docker/Dockerfile
@@ -0,0 +1,10 @@
+FROM i386/alpine
+
+RUN apk update
+RUN apk add --no-cache build-base libpng-dev wine ncurses freetype
+RUN apk add binutils-arm-none-eabi --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
+
+ENV BUSYBOX 1
+WORKDIR /app
+
+CMD ["/bin/sh"]
diff --git a/contrib/docker/build_docker.sh b/contrib/docker/build_docker.sh
new file mode 100755
index 00000000..b59e2158
--- /dev/null
+++ b/contrib/docker/build_docker.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+ver="0.1"
+
+docker inspect pokediamond:$ver > /dev/null
+if [ $? = 0 ];  then
+    echo "Not rebuilding image since image exists";
+else
+    docker build -t pokediamond:$ver $(git rev-parse --show-toplevel)/contrib/docker
+fi
+docker run --network=none -it -v $(git rev-parse --show-toplevel):/app pokediamond:$ver
-- 
cgit v1.2.3