Refine docker f22 images

This commit is contained in:
Christine Dodrill 2015-08-19 13:41:43 -07:00
parent 98aac914bd
commit 63d6667c7e
3 changed files with 15 additions and 9 deletions

View File

@ -35,6 +35,10 @@ 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
# 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
# Set up vim # Set up vim
ADD setup.sh /opt/xena/setup.sh ADD setup.sh /opt/xena/setup.sh
ADD ./vimplugins.lua /opt/xena/vimplugins.lua ADD ./vimplugins.lua /opt/xena/vimplugins.lua
@ -46,10 +50,6 @@ RUN chmod 777 /opt/xena/setup.sh &&\
RUN wget https://get.docker.com/builds/Linux/x86_64/docker-1.6.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
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
# Not needed? # Not needed?
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 &&\
@ -63,6 +63,3 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-stati
RUN chmod +x /tini RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"] ENTRYPOINT ["/tini", "--"]
ENV INITSYSTEM tini ENV INITSYSTEM tini
USER xena
CMD /bin/zsh

View File

@ -0,0 +1,7 @@
FROM xena/base
ADD https://s3.amazonaws.com/download.fpcomplete.com/centos/7/fpco.repo /etc/yum.repos.d/fpco.repo
RUN dnf install -y stack
USER xena
CMD /bin/zsh

View File

@ -1,3 +1,5 @@
FROM xena/dotfiles:f22 FROM xena/base
RUN curl -s https://static.rust-lang.org/rustup.sh | sh USER root
RUN yes | dnf copr enable alonid/rust &&\
dnf install -y rust