From cc6dab90666238316bf91f797eff66f2c3deedff Mon Sep 17 00:00:00 2001
From: Nils Jakobi <jakobi.nils@gmail.com>
Date: Sun, 17 Nov 2019 10:37:29 +0100
Subject: [PATCH] WIP on new devel version

---
 Dockerfile | 42 ++++++++++++++++++++++++++----------------
 start.sh   | 14 --------------
 2 files changed, 26 insertions(+), 30 deletions(-)
 delete mode 100644 start.sh

diff --git a/Dockerfile b/Dockerfile
index e66b296..a9c1184 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,38 @@
-FROM node:latest
+FROM node:13.1.0-alpine
 
-MAINTAINER Stefan Hoffmann <stefan@freifunk-troisdorf.de>
+MAINTAINER Stefan Hoffmann <stefan@freifunk-troisdorf.de>, Nils Jakobi <nils@freifunk-troisdorf.de>
+
+# add community repo
+RUN echo @community http://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories
 
 # Install Yarn
-RUN apt-get update && apt-get install -y curl apt-transport-https && \
-    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && apt-get install -y yarn
+RUN apk add \
+    build-base \
+    gcc \
+    git \
+#    libffi-dev \
+    ruby \
+    ruby-dev \
+    yarn@community
 
 # Install Grunt
 RUN npm install --global grunt-cli && \
-    apt-get install -y ruby ruby-dev && \
     gem install --no-rdoc --no-ri sass -v 3.4.22 && \
     gem install --no-rdoc --no-ri compass
 
-# Build Meshviewer
-#RUN git clone https://github.com/Freifunk-Troisdorf/meshviewer.git /opt/meshviewer/
+# Clone Meshviewer
+WORKDIR /tmp/meshviewer
+RUN git clone https://github.com/Freifunk-Troisdorf/meshviewer.git /tmp/meshviewer
+RUN ls -alh /tmp/meshviewer
 
-#RUN npm install gulp -D && \
-#	yarn && \
-#	yarn global add gulp-cli
+RUN npm install gulp@4 -D
+RUN yarn && \
+    yarn global add gulp-cli
 
-COPY start.sh /
-RUN chmod +x /start.sh
+# create supernode folders
+RUN mkdir -p $(printf "/opt/meshviewer/build/data/tdf%d " {4..7})
 
-ENTRYPOINT ["/start.sh"]
-#RUN gulp
\ No newline at end of file
+# gulp this stuff and delete build environment
+RUN gulp && \
+    cp -r /tmp/meshviewer/build* /opt/meshviewer/build && \
+    rm -rf /tmp/meshviewer
diff --git a/start.sh b/start.sh
deleted file mode 100644
index 9aa567f..0000000
--- a/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-git clone https://github.com/Freifunk-Troisdorf/meshviewer.git /opt/tmp
-cd /opt/tmp
-npm install gulp -D
-yarn
-yarn global add gulp-cli
-gulp
-cp -r /opt/tmp/build/* /opt/meshviewer/build/
-rm -r /opt/tmp
-mkdir /opt/meshviewer/build/data
-mkdir /opt/meshviewer/build/data/tdf4
-mkdir /opt/meshviewer/build/data/tdf5
-mkdir /opt/meshviewer/build/data/tdf6
-mkdir /opt/meshviewer/build/data/tdf7