From 98aac914bd413384b4764ee9b1695e7bd9843349 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <xena@yolo-swag.com>
Date: Wed, 19 Aug 2015 13:13:57 -0700
Subject: [PATCH] formatting

---
 dev/fedora/22/base/Dockerfile | 39 ++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/dev/fedora/22/base/Dockerfile b/dev/fedora/22/base/Dockerfile
index a00b31f..677a018 100644
--- a/dev/fedora/22/base/Dockerfile
+++ b/dev/fedora/22/base/Dockerfile
@@ -1,7 +1,27 @@
 FROM fedora:22
 
 RUN dnf -y groupinstall "Development Tools" &&\
-    dnf -y install tar zsh git python wget openssl-devel vim-enhanced tmux dtach cmake python-devel mercurial lua luarocks gcc-c++ xz clang-devel php &&\
+    dnf -y install \
+      tar \
+      zsh \
+      git \
+      python \
+      wget \
+      openssl-devel \
+      vim-enhanced \
+      tmux \
+      dtach \
+      cmake \
+      python-devel \
+      mercurial \
+      lua \
+      luarocks \
+      gcc-c++ \
+      xz \
+      clang-devel \
+      php \
+      file \
+      net-tools &&\
     useradd --create-home xena && \
     echo 'root:screencast' | chpasswd && \
     echo 'xena:user' | chpasswd && \
@@ -15,20 +35,22 @@ ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LC_CTYPE en_US.UTF-8
 
+# Set up vim
+ADD setup.sh /opt/xena/setup.sh
+ADD ./vimplugins.lua /opt/xena/vimplugins.lua
+RUN chmod 777 /opt/xena/setup.sh &&\
+    su xena "/opt/xena/setup.sh"
+
 # To use Docker please pass the docker socket as a bind mount
-# Some of my servers still use docker 1.3.0
-RUN wget https://get.docker.com/builds/Linux/x86_64/docker-1.3.0 -O /usr/local/bin/docker && \
+# Some of my servers still use docker 1.6.0
+RUN wget https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -O /usr/local/bin/docker && \
     chmod 555 /usr/local/bin/docker
 
 # Golang compilers
 RUN cd /usr/local && wget https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz && \
     tar xf go1.5.linux-amd64.tar.gz && rm go1.5.linux-amd64.tar.gz
 
-ADD setup.sh /opt/xena/setup.sh
-ADD ./vimplugins.lua /opt/xena/vimplugins.lua
-RUN chmod 777 /opt/xena/setup.sh &&\
-    su xena "/opt/xena/setup.sh"
-
+# Not needed?
 RUN dnf -y install dnf-plugins-core &&\
     yes | dnf copr enable xena/moonscript &&\
     dnf -y install lua-moonscript &&\
@@ -40,6 +62,7 @@ ENV TINI_VERSION v0.5.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static /tini
 RUN chmod +x /tini
 ENTRYPOINT ["/tini", "--"]
+ENV INITSYSTEM tini
 
 USER xena
 CMD /bin/zsh