From eb652fd084ecf7e2fc98ea7ea68fc0f723cfc662 Mon Sep 17 00:00:00 2001
From: Aiko Mastboom <git@aiko.sh>
Date: Sun, 8 Nov 2015 22:05:57 +0100
Subject: [PATCH] all in one layer

---
 Dockerfile | 33 +++++++++++++++++++++------------
 Makefile   | 19 +++++++++++++++++++
 2 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 Makefile

diff --git a/Dockerfile b/Dockerfile
index 06d641b..6fd3617 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,21 +4,30 @@ FROM aiko/baseimage-pi:0.9.16
 
 MAINTAINER Aiko Mastboom <docker@aiko.sh>
 
+# Set the locale
+ENV LANG=en_US.UTF-8 \
+  LANGUAGE=en_US:en \
+  LC_ALL=en_US.UTF-8
+
 RUN apt-get update \
-  && apt-get install -y wget libssl-dev ncurses-dev m4
-
-RUN wget http://www.erlang.org/download/otpsrc17.4.tar.gz \
- && tar -xzvf otpsrc17.4.tar.gz
-
-RUN \
- && cd otpsrc17.4/ && ./configure && make \
- && make install
-
-# Clean up APT when done.
-RUN rm -rf otpsrc17.4 && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+  && apt-get upgrade -y -o Dpkg::Options::="--force-confold" \
+  && apt-get install -y wget libssl-dev ncurses-dev m4 build-essential \
+  && echo -n 'en_US.UTF-8' >> /etc/locale.gen \
+  && locale-gen en_US.UTF-8 \
+  && update-locale LANG=en_US.UTF-8 \
+  && wget http://www.erlang.org/download/otp_src_18.1.tar.gz \
+  && tar -xzvf otp_src_18.1.tar.gz && cd otp_src_18.1/ \
+  && ./configure --without-wx --prefix=/usr \
+  && make -j4 && make install \
+  && cd - \
+  && rm -rf /otp_src_18.1.tar.gz \
+  && rm -rf /otp_src_18.1 \
+  && apt-get remove -y build-essential wget libssl-dev ncurses-dev m4 \
+  && apt-get autoremove -y \
+  && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Define working directory
-WORKDIR /data
+#WORKDIR /data
 
 # Define default command
 # CMD ["bash"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9c3b5bb
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+DOCKER_IMAGE_VERSION=18.1
+DOCKER_IMAGE_NAME=aiko/erlang-docker-pi
+DOCKER_IMAGE_TAGNAME=$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_VERSION)
+
+default: build
+
+build:
+	docker build -t $(DOCKER_IMAGE_TAGNAME) .
+	docker tag -f $(DOCKER_IMAGE_TAGNAME) $(DOCKER_IMAGE_NAME):latest
+
+push:
+	docker push $(DOCKER_IMAGE_NAME)
+
+test:
+	docker run --rm $(DOCKER_IMAGE_TAGNAME) /bin/echo "Success."
+
+version:
+	docker run --rm $(DOCKER_IMAGE_TAGNAME) node --version
+	docker run --rm $(DOCKER_IMAGE_TAGNAME) npm --version