From f59127ffef534d639335acdb542dfee6bf894e23 Mon Sep 17 00:00:00 2001
From: Cody Hiar <codyfh@gmail.com>
Date: Sat, 29 Apr 2017 16:32:02 +0000
Subject: Updating docker build process

---
 Dockerfile                    | 10 ++++++++--
 shellcheck-builder/Dockerfile | 21 +++------------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fa658de..b710807 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:3.5
 
 ########################################
 # System Stuff
@@ -7,6 +7,10 @@ FROM alpine:3.4
 # Add the testing repo to get neovim
 RUN echo "http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
+
+# Update
+RUN apk update
+
 # Install all the needed packages
 RUN apk add --no-cache \
       # My Stuff
@@ -32,7 +36,9 @@ RUN apk add --no-cache \
       musl-dev \ 
       gcc \
       # Needed for infocmp and tic
-      ncurses
+      ncurses \
+      # Needed for php libcrypto.so errors
+      libressl2.4-libcrypto
 
 ########################################
 # PHP
diff --git a/shellcheck-builder/Dockerfile b/shellcheck-builder/Dockerfile
index fc48715..c2bea54 100644
--- a/shellcheck-builder/Dockerfile
+++ b/shellcheck-builder/Dockerfile
@@ -1,27 +1,12 @@
-FROM mitchty/alpine-ghc:8.0
-
-MAINTAINER Nikyle Nguyen <NLKNguyen@MSN.com>
-
-RUN apk add --no-cache build-base git
-
-
-RUN mkdir -p /usr/src/shellcheck
-WORKDIR /usr/src/shellcheck
-
-RUN git clone https://github.com/koalaman/shellcheck .
-RUN cabal update && cabal install
-
-ENV PATH="/root/.cabal/bin:$PATH"
-
+FROM rdeavila/docker-shellcheck:latest
 
 # Get shellcheck binary
 RUN mkdir -p /package/bin/
-RUN cp $(which shellcheck) /package/bin/
+RUN cp ~/.cabal/bin/shellcheck /package/bin/
 
 # Get shared libraries
 RUN mkdir -p /package/lib/
-RUN ldd $(which shellcheck) | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' /package/lib/
-
+RUN ldd ~/.cabal/bin/shellcheck | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' /package/lib/
 
 # Copy shellcheck package out to mounted directory
 CMD ["cp", "-avr", "/package", "/mnt/"]
-- 
cgit v1.2.3