Merge branch 'master' into permission-vertical

This commit is contained in:
Kai Börnert
2019-01-22 10:35:46 +01:00
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -5,7 +5,8 @@ WORKDIR /home/sailing/servers/server
RUN wget -O /tmp/RELEASE.tar.gz http://releases.sapsailing.com/RELEASE/RELEASE.tar.gz \
&& tar xzvpf /tmp/RELEASE.tar.gz \
&& rm /tmp/RELEASE.tar.gz
RUN apt-get install -y vim
RUN apt-get update \
&& apt-get install -y vim
COPY vimrc /root/.vimrc
RUN apt-get install -y telnet dnsutils net-tools
RUN wget -O /tmp/rds.pem https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem \
File diff suppressed because one or more lines are too long