From b4654e866118b46bfd13a1c93da223be7556771c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helge=20He=C3=9F?= <devteam@zeezide.de>
Date: Wed, 5 Sep 2018 16:02:35 +0200
Subject: [PATCH] Rebuild armv8 versions, push to DockerHub

... pull a new build from futurejones, push it as 4.1.1
---
 Makefile                                      | 14 ++++
 .../arm64v8-ubuntu-swift-4.1.x.dockerfile     |  0
 empty-ctx/arm64v8-swift-4.1.1-dev.dockerfile  | 76 +++++++++++++++++++
 3 files changed, 90 insertions(+)
 rename arm64v8-4.1.0-futurejones/arm64v8-ubuntu-swift-4.1.0.dockerfile => arm64v8-4.1.x-futurejones/arm64v8-ubuntu-swift-4.1.x.dockerfile (100%)
 create mode 100644 empty-ctx/arm64v8-swift-4.1.1-dev.dockerfile

diff --git a/Makefile b/Makefile
index eee6791..f234792 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,20 @@ PACKAGE_TARGET_DIR=/tmp
 
 # --------------------------- 4.1.x
 
+build-arm64-swift-41 :
+	time docker build -t helje5/arm64v8-swift:4.1.1 \
+	                  -t helje5/arm64v8-swift:latest \
+	     -f arm64v8-4.1.x-futurejones/arm64v8-ubuntu-swift-4.1.x.dockerfile \
+	     ./empty-ctx
+	docker images | grep helje5/arm64v8
+
+build-arm64-swift-41-dev :
+	time docker build -t helje5/arm64v8-swift-dev:4.1.1 \
+	                  -t helje5/arm64v8-swift-dev:latest \
+	     -f empty-ctx/arm64v8-swift-4.1.1-dev.dockerfile \
+	     ./empty-ctx
+	docker images | grep helje5/arm64v8
+
 build-rpi-swift-41 :
 	time docker build -t helje5/rpi-swift:4.1.2 \
 		     -f rpi-swift-4.1.2-chnmrc-ctx/rpi-ubuntu-swift-4.1.2.dockerfile \
diff --git a/arm64v8-4.1.0-futurejones/arm64v8-ubuntu-swift-4.1.0.dockerfile b/arm64v8-4.1.x-futurejones/arm64v8-ubuntu-swift-4.1.x.dockerfile
similarity index 100%
rename from arm64v8-4.1.0-futurejones/arm64v8-ubuntu-swift-4.1.0.dockerfile
rename to arm64v8-4.1.x-futurejones/arm64v8-ubuntu-swift-4.1.x.dockerfile
diff --git a/empty-ctx/arm64v8-swift-4.1.1-dev.dockerfile b/empty-ctx/arm64v8-swift-4.1.1-dev.dockerfile
new file mode 100644
index 0000000..3fa1ad6
--- /dev/null
+++ b/empty-ctx/arm64v8-swift-4.1.1-dev.dockerfile
@@ -0,0 +1,76 @@
+# Dockerfile
+#
+#   docker build -t helje5/arm64v8-swift-dev:4.1.0 \
+#     -f empty-ctx/arm64v8-swift-4.1.0-dev.dockerfile \
+#     ./empty-ctx
+#   docker run -i --tty --name "swift-dev" --rm helje5/arm64v8-swift-dev:4.1.0
+#
+FROM helje5/arm64v8-swift:4.1.1
+
+LABEL maintainer "Helge Heß <me@helgehess.eu>"
+
+# rpi-swift sets it to swift
+USER root
+
+ENV DEBIAN_FRONTEND noninteractive
+
+ARG CLANG_VERSION=3.8
+
+RUN apt-get install -y apt-utils \
+                       vim emacs make \
+                       git libicu55 libedit2
+
+# rpi-swift is installing stuff into site-packages, need to move them away
+RUN bash -c "\
+  mv /usr/lib/python2.7/site-packages /usr/lib/python2.7/site-packages.swift; \
+  apt-get install -y python2.7-minimal; \
+  mv /usr/lib/python2.7/site-packages.swift/* \
+     /usr/local/lib/python2.7/dist-packages/; \
+  rmdir /usr/lib/python2.7/site-packages.swift \
+"
+
+RUN apt-get install -y \
+  python                      \
+  \
+  clang-$CLANG_VERSION libxml2-dev bison lsb-release gdb \
+  \
+  libicu-dev                  \
+  autoconf libtool pkg-config \
+  libblocksruntime-dev        \
+  libpthread-workqueue-dev    \
+  systemtap-sdt-dev           \
+  libbsd-dev libbsd0          \
+  curl libcurl4-openssl-dev   \
+  libedit-dev                 \
+  libxml2                     \
+  wget sudo gosu              \
+  zlib1g-dev                  \
+  libsqlite3-dev              \
+  telnet netcat               \
+  inetutils-ping dialog       \
+  nfs-common
+
+RUN bash -c "update-alternatives --quiet --install /usr/bin/clang \
+               clang   /usr/bin/clang-$CLANG_VERSION   100;\
+             update-alternatives --quiet --install /usr/bin/clang++ \
+               clang++ /usr/bin/clang++-$CLANG_VERSION 100"
+
+# setup sudo # TODO: sounds like we are supposed to use gosu instead
+
+RUN bash -c "\
+  adduser swift sudo; \
+  echo 'swift ALL=(ALL:ALL) ALL' > /etc/sudoers.d/swift; \
+  chmod 0440 /etc/sudoers.d/swift; \
+  echo 'swift:swift' | chpasswd \
+"
+
+USER swift
+WORKDIR /home/swift
+
+RUN bash -c "\
+  mkdir -p /home/swift/.emacs.d/lisp; \
+  curl -L -o /home/swift/.emacs.d/lisp/swift-mode.el https://raw.githubusercontent.com/iamleeg/swift-mode/master/swift-mode.el; \
+  echo \"(add-to-list 'load-path \\\"~/.emacs.d/lisp/\\\")\" >> .emacs; \
+  echo \"(require 'swift-mode)\"; >> .emacs \
+  echo \"(setq-default indent-tabs-mode nil)\" >> .emacs \
+"