From 4b0ff446ba7ddf5bcd33daf7f798b23c0db9f451 Mon Sep 17 00:00:00 2001
From: Simo Kinnunen <simo@shoqolate.com>
Date: Wed, 24 Feb 2016 15:05:45 +0900
Subject: [PATCH] Changes required for Scaleway + OverlayFS.

---
 docker/armv7l/README.md         | 10 ++++++++++
 docker/armv7l/mkimage-alpine.sh |  2 ++
 docker/armv7l/publish.sh        |  5 -----
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 docker/armv7l/README.md
 delete mode 100755 docker/armv7l/publish.sh

diff --git a/docker/armv7l/README.md b/docker/armv7l/README.md
new file mode 100644
index 00000000..a9ced0cb
--- /dev/null
+++ b/docker/armv7l/README.md
@@ -0,0 +1,10 @@
+# [openstf/stf-armv7l](https://hub.docker.com/r/openstf/stf-armv7l/)
+
+An alternate docker image for `armv7l`.
+
+To build the image, run the following commands from the repo root directory (**not** this directory) on an `armv7l` machine:
+
+```bash
+ARCH=armhf docker/armv7l/mkimage-alpine.sh
+docker build -f docker/armv7l/Dockerfile -t openstf/stf-armv7l:latest
+```
diff --git a/docker/armv7l/mkimage-alpine.sh b/docker/armv7l/mkimage-alpine.sh
index c2326f3c..236598ca 100755
--- a/docker/armv7l/mkimage-alpine.sh
+++ b/docker/armv7l/mkimage-alpine.sh
@@ -18,6 +18,8 @@ usage() {
 tmp() {
 	TMP=$(mktemp -d ${TMPDIR:-/var/tmp}/alpine-docker-XXXXXXXXXX)
 	ROOTFS=$(mktemp -d ${TMPDIR:-/var/tmp}/alpine-docker-rootfs-XXXXXXXXXX)
+	# This needs to be done or overlayfs won't be happy with our imported image.
+	chmod 755 $ROOTFS
 	trap "rm -rf $TMP $ROOTFS" EXIT TERM INT
 }
 
diff --git a/docker/armv7l/publish.sh b/docker/armv7l/publish.sh
deleted file mode 100755
index c95b54b0..00000000
--- a/docker/armv7l/publish.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-set -xeuo pipefail
-ARCH=armhf docker/armv7l/mkimage-alpine.sh
-docker build -f docker/armv7l/Dockerfile -t openstf/stf-armv7l:latest
-docker push openstf/stf-armv7l:latest