From 4ba963982720c79cd2fadae4ee3da38610101e30 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@jessfraz.com>
Date: Sat, 25 May 2019 17:41:09 -0400
Subject: [PATCH] update consul and rstudio

Signed-off-by: Jess Frazelle <acidburn@jessfraz.com>
---
 consul/Dockerfile  | 5 ++++-
 rstudio/Dockerfile | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/consul/Dockerfile b/consul/Dockerfile
index f1f3599..0551445 100644
--- a/consul/Dockerfile
+++ b/consul/Dockerfile
@@ -44,7 +44,10 @@ RUN gem install \
 
 RUN cd ui-v2 \
 	&& yarn install \
-	&& make
+	&& make \
+	&& rm -rf ../pkg/web_ui \
+	&& mkdir -p ../pkg \
+	&& cp -r dist ../pkg/web_ui
 
 RUN TERM=xterm XC_ARCH="amd64" XC_OS="linux" LD_FLAGS=" -extldflags -static" make tools static-assets bin \
 	&& mv bin/consul /usr/bin/consul
diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile
index 1c3ac37..ce53afd 100644
--- a/rstudio/Dockerfile
+++ b/rstudio/Dockerfile
@@ -50,7 +50,7 @@ RUN apt-get update && apt-get install -y \
 	&& rm -rf /var/lib/apt/lists/*
 
 # https://www.rstudio.com/products/rstudio/download/#download
-ENV RSTUDIO_VERSION 1.1.463
+ENV RSTUDIO_VERSION 1.2.1335
 
 # Download the source
 RUN buildDeps=' \
@@ -60,7 +60,7 @@ RUN buildDeps=' \
 	&& set -x \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/* \
-	&& curl -sSL "https://download1.rstudio.org/rstudio-${RSTUDIO_VERSION}-amd64.deb" -o /tmp/rstudio-amd64.deb \
+	&& curl -sSL "https://download1.rstudio.org/desktop/trusty/amd64/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 \