From 6bd1fc97fce04c27611c881aa77803a763e11fc5 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Mon, 6 Mar 2017 06:25:28 +0000
Subject: [PATCH] simplified using alpine repo packages

---
 Dockerfile                                | 42 +++++++++--------------
 mitch.tishmack@gmail.com-55881c97.rsa.pub |  9 -----
 2 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 mitch.tishmack@gmail.com-55881c97.rsa.pub

diff --git a/Dockerfile b/Dockerfile
index 894d171..b1d1221 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,46 +1,38 @@
 FROM alpine:edge
-MAINTAINER sparklyballs
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
-# copy apk key
-COPY mitch.tishmack@gmail.com-55881c97.rsa.pub /etc/apk/keys/mitch.tishmack@gmail.com-55881c97.rsa.pub
-
-# install packages
+# install build packages
 RUN \
- echo "https://s3-us-west-2.amazonaws.com/alpine-ghc/next/8.0" >> /etc/apk/repositories && \
  apk add --no-cache --virtual=build-dependencies \
-	bash \
-	binutils \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	cabal \
-	g++ \
-	gcc \
-	ghc \
-	ghc-dev \
-	git \
-	make \
-	stack && \
+	ghc && \
 
-# update cabal and stack
- cabal \
-	update && \
- stack \
-	update && \
+ apk add --no-cache --virtual=build-dependencies \
+	libffi-dev \
+	musl-dev && \
 
-# compile shellcheck
+# compile shellcheck
+ cabal update && \
  cabal install ShellCheck && \
+
+# install shellcheck
  cp /root/.cabal/bin/shellcheck /usr/local/bin/ && \
- ldd /root/.cabal/bin/shellcheck | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}'  /usr/local/lib/ && \
+ ldd \
+	/root/.cabal/bin/shellcheck | grep "=> /" \
+	| awk '{print $3}' | xargs -I '{}' cp -v '{}'  \
+	/usr/local/lib/ && \
  ldconfig /usr/local/lib && \
 
-# clean up
+# cleanup
  apk del --purge \
 	build-dependencies && \
- rm -rf \
+rm -rf \
+	/root \
 	/tmp/* && \
- find /root -name . -o -prune -exec rm -rf -- {} + && \
  mkdir -p \
 	/root
diff --git a/mitch.tishmack@gmail.com-55881c97.rsa.pub b/mitch.tishmack@gmail.com-55881c97.rsa.pub
deleted file mode 100644
index abff12b..0000000
--- a/mitch.tishmack@gmail.com-55881c97.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2a48dmrwQSo/TnAfjjYI
-Rdq6cZLRhD12m4pZJ3qJSBGkgderPQPI/aiP5Gg/lSdoNKiBE3pIGGNkKhafgrY9
-e5FAkX68+A2vKEUniWX3fcyh4fl+8WmT1vtFklSe4Y6tzJqEOe92ijqUJuAuJR3h
-OdeEQuIkm0t3oCrjFlk7CmBRXTNSdpxBApakX9R/ATtA5HLs/hms3Xnwn7W/hDJ4
-d2kMo7b8sQGeNDtOhLRaOLZWIBkY65xJDGFvsugXodyspMf4MKWNifT9SY/tE8x7
-ISxFN3b+4ewLoLn/xQdoUinWuiNeyFB9YsA1aj6+88sU1wPsuT17PGQGYG1ZzkDs
-wwIDAQAB
------END PUBLIC KEY-----