From a51a48d562aa44e4160fb189fc4bfde99e384b38 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@microsoft.com>
Date: Fri, 23 Mar 2018 19:52:30 -0400
Subject: [PATCH] update vagrant and rstudio

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
---
 latest-versions.sh |  3 ++-
 rstudio/Dockerfile | 26 ++++++++++++++++++--------
 vagrant/Dockerfile | 18 ++++++++++++++----
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/latest-versions.sh b/latest-versions.sh
index 8595f1a..06f2e1a 100755
--- a/latest-versions.sh
+++ b/latest-versions.sh
@@ -112,13 +112,14 @@ Tautulli/Tautulli
 powershell/powershell
 ricochet-im/ricochet
 reverse-shell/routersploit
+rstudio/rstudio
 tarsnap/tarsnap
+fcambus/telize
 nginx/nginx
 simplresty/ngx_devel_kit
 openresty/lua-nginx-module
 leev/ngx_http_geoip2_module
 maxmind/libmaxminddb
-fcambus/telize
 hashicorp/terraform
 kdlucas/byte-unixbench
 mitchellh/vagrant
diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile
index 46de4e3..ba1201f 100644
--- a/rstudio/Dockerfile
+++ b/rstudio/Dockerfile
@@ -13,11 +13,8 @@
 FROM debian:jessie
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
-ADD https://download1.rstudio.org/rstudio-0.99.484-amd64.deb /src/rstudio.deb
-
-# Install Rstudio
+# Install Rstudio deps
 RUN apt-get update && apt-get install -y \
-	ca-certificates \
 	fcitx-frontend-qt5 \
 	fcitx-modules \
 	fcitx-module-dbus \
@@ -50,11 +47,24 @@ RUN apt-get update && apt-get install -y \
 	&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
 	&& locale-gen en_US.utf8 \
 	&& /usr/sbin/update-locale LANG=en_US.UTF-8 \
-	&& dpkg -i '/src/rstudio.deb' \
-	&& apt-get install -fy \
+	&& rm -rf /var/lib/apt/lists/*
+
+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 /src/*.deb \
-	&&  ln -f -s /usr/lib/rstudio/bin/rstudio /usr/bin/rstudio
+	&& 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
+
 
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
diff --git a/vagrant/Dockerfile b/vagrant/Dockerfile
index 53b8316..1e592d6 100644
--- a/vagrant/Dockerfile
+++ b/vagrant/Dockerfile
@@ -16,10 +16,20 @@ RUN	apt-get update && apt-get install -y \
 
 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
-RUN dpkg -i /src/vagrant_${VAGRANT_VERSION}_x86_64.deb \
-	&& vagrant plugin install vagrant-libvirt
+# install  the libvirt plugin
+RUN vagrant plugin install vagrant-libvirt
 
 ENTRYPOINT [ "vagrant" ]