Move back to ubuntu, fuck alpine's shitty package selection

3 files changed, 30 insertions, 69 deletions

diff --git a/Dockerfile b/Dockerfile
index b710807..618597a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,44 +1,44 @@
-FROM alpine:3.5
+FROM ubuntu:16.04
+MAINTAINER Cody Hiar <codyfh@gmail.com>
 
 ########################################
 # System Stuff
 ########################################
 
-# 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
+# Better terminal support
+ENV TERM screen-256color
+ENV DEBIAN_FRONTEND noninteractive
 
-# Install all the needed packages
-RUN apk add --no-cache \
-      # My Stuff
+# Update and install
+RUN apt-get update && apt-get install -y \
       bash \
-      unibilium \
-      php5 \
-      php5-json \
-      php5-phar \
-      php5-openssl \
       curl \
       git \
-      ack \
-      python \
+      software-properties-common \
       python-dev \
-      python3 \
+      python-pip \
       python3-dev \
-      nodejs \
-      neovim \
-      neovim-doc \
+      python3-pip \
       ctags \
-      vimdiff \
-      # Needed for python pip installs
-      musl-dev \ 
-      gcc \
-      # Needed for infocmp and tic
-      ncurses \
-      # Needed for php libcrypto.so errors
-      libressl2.4-libcrypto
+      shellcheck \
+      locales
+
+# Generally a good idea to have these, extensions sometimes need them
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+# Install PHP 5.6/Neovim
+RUN add-apt-repository ppa:ondrej/php
+RUN add-apt-repository ppa:neovim-ppa/stable
+# Install custom packages
+RUN apt-get update && apt-get install -y \
+      php5.6 \
+      php5.6-zip \
+      php5.6-xml \
+      neovim
+
 
 ########################################
 # PHP
@@ -58,38 +58,15 @@ RUN phpcs --config-set installed_paths /root/.composer/vendor/escapestudios/symf
 # Install custom linting
 ADD PEARish.xml /root/PEARish.xml
 
+
 ########################################
 # Python
 ########################################
 
 # Install python linting and neovim plugin
-RUN python -m ensurepip
 RUN pip install neovim jedi flake8 flake8-docstrings flake8-isort flake8-quotes pep8-naming pep257 isort
 RUN pip3 install neovim jedi flake8 flake8-docstrings flake8-isort flake8-quotes pep8-naming pep257 isort
 
-########################################
-# Shellcheck
-########################################
-
-# Copy over the shellcheck binaries
-COPY package/bin/shellcheck /usr/local/bin/
-COPY package/lib/           /usr/local/lib/
-RUN ldconfig /usr/local/lib
-
-########################################
-# Javscript
-########################################
-# Install nodejs linting
-# Install JS linting modules
-# Install sass linting
-RUN npm install -g \
-      eslint@\^3.14.0 eslint-config-airbnb-base eslint-plugin-import eslint-plugin-vue \
-      sass-lint@\^1.10.2
-# Install the eslintrc.js
-ADD eslintrc.js /root/.eslintrc.js
-# Install the sass-lint.yaml
-ADD sass-lint.yaml /root/.sass-lint.yaml
-
 
 ########################################
 # Personalizations
@@ -100,8 +77,6 @@ ADD bashrc /root/.bashrc
 ADD gitconfig /etc/gitconfig
 # Change the workdir, Put it inside root so I can see neovim settings in finder
 WORKDIR /root/app
-# Better terminal support
-ENV TERM screen-256color
 # Neovim needs this so that <ctrl-h> can work
 RUN infocmp $TERM | sed 's/kbs=^[hH]/kbs=\\177/' > /tmp/$TERM.ti
 RUN tic /tmp/$TERM.ti
diff --git a/Makefile b/Makefile
index 0248164..7dc19f7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,6 @@ setup: ## Clone down additional repos that are needed for building
 	git clone git@github.com:thornycrackers/vim-options.git
 
 build: ## Build the base image
-	docker build -t thornycrackers/shellcheck shellcheck-builder
-	docker run --rm -it -v $(CURDIR):/mnt thornycrackers/shellcheck
 	docker build -t thornycrackers/neovim .
 	docker push $(IMAGENAME)
 
diff --git a/shellcheck-builder/Dockerfile b/shellcheck-builder/Dockerfile
deleted file mode 100644
index c2bea54..0000000
--- a/shellcheck-builder/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM rdeavila/docker-shellcheck:latest
-
-# Get shellcheck binary
-RUN mkdir -p /package/bin/
-RUN cp ~/.cabal/bin/shellcheck /package/bin/
-
-# Get shared libraries
-RUN mkdir -p /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/"]