xZero707/dockerfiles
1
0
Fork 0
mirror of https://github.com/jessfraz/dockerfiles.git synced 2024-11-23 11:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

update consul and rstudio

Browse Source 
Signed-off-by: Jess Frazelle <acidburn@jessfraz.com>
This commit is contained in:
Jess Frazelle 2019-05-25 17:41:09 -04:00
parent c554b399ab
commit 4ba9639827
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
consul/Dockerfile
View File

@ -44,7 +44,10 @@ RUN gem install \
RUN cd ui-v2 \ RUN cd ui-v2 \
&& yarn install \ && 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 \ RUN TERM=xterm XC_ARCH="amd64" XC_OS="linux" LD_FLAGS=" -extldflags -static" make tools static-assets bin \
&& mv bin/consul /usr/bin/consul && mv bin/consul /usr/bin/consul

4
rstudio/Dockerfile
View File

@ -50,7 +50,7 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# https://www.rstudio.com/products/rstudio/download/#download # https://www.rstudio.com/products/rstudio/download/#download
ENV RSTUDIO_VERSION 1.1.463 ENV RSTUDIO_VERSION 1.2.1335
# Download the source # Download the source
RUN buildDeps=' \ RUN buildDeps=' \
@ -60,7 +60,7 @@ RUN buildDeps=' \
&& set -x \ && set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && 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 \ && dpkg -i /tmp/rstudio-amd64.deb \
&& rm -rf /tmp/*.deb \ && rm -rf /tmp/*.deb \
&& apt-get purge -y --auto-remove $buildDeps \ && apt-get purge -y --auto-remove $buildDeps \