update vagrant and rstudio

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
Jess Frazelle 2018-03-23 19:52:30 -04:00
parent 30d3a3744c
commit a51a48d562
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
3 changed files with 34 additions and 13 deletions

View File

@ -112,13 +112,14 @@ Tautulli/Tautulli
powershell/powershell powershell/powershell
ricochet-im/ricochet ricochet-im/ricochet
reverse-shell/routersploit reverse-shell/routersploit
rstudio/rstudio
tarsnap/tarsnap tarsnap/tarsnap
fcambus/telize
nginx/nginx nginx/nginx
simplresty/ngx_devel_kit simplresty/ngx_devel_kit
openresty/lua-nginx-module openresty/lua-nginx-module
leev/ngx_http_geoip2_module leev/ngx_http_geoip2_module
maxmind/libmaxminddb maxmind/libmaxminddb
fcambus/telize
hashicorp/terraform hashicorp/terraform
kdlucas/byte-unixbench kdlucas/byte-unixbench
mitchellh/vagrant mitchellh/vagrant

View File

@ -13,11 +13,8 @@
FROM debian:jessie FROM debian:jessie
LABEL maintainer "Jessie Frazelle <jess@linux.com>" LABEL maintainer "Jessie Frazelle <jess@linux.com>"
ADD https://download1.rstudio.org/rstudio-0.99.484-amd64.deb /src/rstudio.deb # Install Rstudio deps
# Install Rstudio
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
ca-certificates \
fcitx-frontend-qt5 \ fcitx-frontend-qt5 \
fcitx-modules \ fcitx-modules \
fcitx-module-dbus \ fcitx-module-dbus \
@ -50,12 +47,25 @@ RUN apt-get update && apt-get install -y \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.utf8 \ && locale-gen en_US.utf8 \
&& /usr/sbin/update-locale LANG=en_US.UTF-8 \ && /usr/sbin/update-locale LANG=en_US.UTF-8 \
&& dpkg -i '/src/rstudio.deb' \ && rm -rf /var/lib/apt/lists/*
&& apt-get install -fy \
ENV RSTUDIO_VERSION 1.1.442
# Download the source
RUN buildDeps=' \
ca-certificates \
curl \
' \
&& set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -rf /src/*.deb \ && curl -sSL "https://download1.rstudio.org/rstudio-${RSTUDIO_VERSION}-amd64.deb" -o /tmp/rstudio-amd64.deb \
&& dpkg -i /tmp/rstudio-amd64.deb \
&& rm -rf /tmp/*.deb \
&& apt-get purge -y --auto-remove $buildDeps \
&& ln -f -s /usr/lib/rstudio/bin/rstudio /usr/bin/rstudio && ln -f -s /usr/lib/rstudio/bin/rstudio /usr/bin/rstudio
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8

View File

@ -16,10 +16,20 @@ RUN apt-get update && apt-get install -y \
ENV VAGRANT_VERSION 2.0.3 ENV VAGRANT_VERSION 2.0.3
ADD https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb /src/vagrant_${VAGRANT_VERSION}_x86_64.deb # download the source
RUN buildDeps=' \
ca-certificates \
curl \
' \
&& set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
&& curl -sSL "https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb" -o /tmp/vagrant-amd64.deb \
&& dpkg -i /tmp/vagrant-amd64.deb \
&& rm -rf /tmp/*.deb \
&& apt-get purge -y --auto-remove $buildDeps
# install vagrant and the libvirt plugin # install the libvirt plugin
RUN dpkg -i /src/vagrant_${VAGRANT_VERSION}_x86_64.deb \ RUN vagrant plugin install vagrant-libvirt
&& vagrant plugin install vagrant-libvirt
ENTRYPOINT [ "vagrant" ] ENTRYPOINT [ "vagrant" ]