formatting

This commit is contained in:
Christine Dodrill 2015-08-19 13:13:57 -07:00
parent f676a210f2
commit 98aac914bd
1 changed files with 31 additions and 8 deletions

View File

@ -1,7 +1,27 @@
FROM fedora:22 FROM fedora:22
RUN dnf -y groupinstall "Development Tools" &&\ 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 && \ useradd --create-home xena && \
echo 'root:screencast' | chpasswd && \ echo 'root:screencast' | chpasswd && \
echo 'xena:user' | chpasswd && \ echo 'xena:user' | chpasswd && \
@ -15,20 +35,22 @@ ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LC_CTYPE 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 # To use Docker please pass the docker socket as a bind mount
# Some of my servers still use docker 1.3.0 # Some of my servers still use docker 1.6.0
RUN wget https://get.docker.com/builds/Linux/x86_64/docker-1.3.0 -O /usr/local/bin/docker && \ 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 chmod 555 /usr/local/bin/docker
# Golang compilers # Golang compilers
RUN cd /usr/local && wget https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz && \ 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 tar xf go1.5.linux-amd64.tar.gz && rm go1.5.linux-amd64.tar.gz
ADD setup.sh /opt/xena/setup.sh # Not needed?
ADD ./vimplugins.lua /opt/xena/vimplugins.lua
RUN chmod 777 /opt/xena/setup.sh &&\
su xena "/opt/xena/setup.sh"
RUN dnf -y install dnf-plugins-core &&\ RUN dnf -y install dnf-plugins-core &&\
yes | dnf copr enable xena/moonscript &&\ yes | dnf copr enable xena/moonscript &&\
dnf -y install lua-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 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static /tini
RUN chmod +x /tini RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"] ENTRYPOINT ["/tini", "--"]
ENV INITSYSTEM tini
USER xena USER xena
CMD /bin/zsh CMD /bin/zsh