Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
verse
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
rocker
verse
Commits
e81ddbd5
Commit
e81ddbd5
authored
5 years ago
by
Carl Boettiger
Browse files
Options
Downloads
Patches
Plain Diff
also update devel rstudio version detection
parent
3660ec27
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
rstudio/devel/Dockerfile
+18
-9
18 additions, 9 deletions
rstudio/devel/Dockerfile
with
18 additions
and
9 deletions
rstudio/devel/Dockerfile
+
18
−
9
View file @
e81ddbd5
FROM
rocker/r-ver:devel
ARG
RSTUDIO_VERSION
#ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.463}
ARG
S6_VERSION
ARG
PANDOC_TEMPLATES_VERSION
ENV
S6_VERSION=${S6_VERSION:-v1.21.7.0}
ENV
S6_BEHAVIOUR_IF_STAGE2_FAILS=2
ENV
PATH=/usr/lib/rstudio-server/bin:$PATH
ENV
PANDOC_TEMPLATES_VERSION=${PANDOC_TEMPLATES_VERSION:-2.6}
## Download and install RStudio server & dependencies
## Attempts to get detect latest version, otherwise falls back to version given in $VER
...
...
@@ -19,21 +22,29 @@ RUN apt-get update \
libssl-dev
\
lsb-release
\
psmisc
\
procps
\
python-setuptools
\
sudo
\
wget
\
libclang-dev
\
libclang-3.8-dev
\
libobjc-6-dev
\
libclang1-3.8
\
libclang-common-3.8-dev
\
libllvm3.8
\
libobjc4
\
libgc1c2
\
&&
wget
-O
libssl1.0.0.deb http://ftp.debian.org/debian/pool/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u8_amd64.deb
\
&&
dpkg
-i
libssl1.0.0.deb
\
&&
rm
libssl1.0.0.deb
\
&&
RSTUDIO_LATEST
=
$(
wget
--no-check-certificate
-qO-
https://s3.amazonaws.com/rstudio-server/current.ver
)
\
&&
[
-z
"
$RSTUDIO_VERSION
"
]
&&
RSTUDIO_VERSION
=
$RSTUDIO_LATEST
||
true
\
&&
wget
-q
http://download2.rstudio.org/rstudio-server-
${
RSTUDIO_VERSION
}
-amd64
.deb
\
&&
dpkg
-i
rstudio-server-
${
RSTUDIO_VERSION
}
-amd64
.deb
\
&&
if
[
-z
"
$RSTUDIO_VERSION
"
]
;
then
RSTUDIO_URL
=
"https://www.rstudio.org/download/latest/stable/server/debian9_64/rstudio-server-latest-amd64.deb"
;
else
RSTUDIO_URL
=
"http://download2.rstudio.org/rstudio-server-
${
RSTUDIO_VERSION
}
-amd64.deb"
;
fi
\
&&
wget
-q
$RSTUDIO_URL
\
&&
dpkg
-i
rstudio-server-
*
-amd64
.deb
\
&&
rm
rstudio-server-
*
-amd64
.deb
\
## Symlink pandoc & standard pandoc templates for use system-wide
&& ln -s /usr/lib/rstudio-server/bin/pandoc/pandoc /usr/local/bin \
&& ln -s /usr/lib/rstudio-server/bin/pandoc/pandoc-citeproc /usr/local/bin \
&& git clone https://github.com/jgm/pandoc-templates \
&& git clone
--recursive --branch ${PANDOC_TEMPLATES_VERSION}
https://github.com/jgm/pandoc-templates \
&& mkdir -p /opt/pandoc/templates \
&& cp -r pandoc-templates*/* /opt/pandoc/templates && rm -rf pandoc-templates* \
&& mkdir /root/.pandoc && ln -s /opt/pandoc/templates /root/.pandoc/templates \
...
...
@@ -82,8 +93,7 @@ RUN apt-get update \
> /home/rstudio/.rstudio/monitored/user-settings/user-settings \
&& chown -R rstudio:rstudio /home/rstudio/.rstudio
## User configuration script
COPY
userconf.sh /etc/cont-init.d/01-userconf
COPY
userconf.sh /etc/cont-init.d/userconf
## running with "-e ADD=shiny" adds shiny server
COPY
add_shiny.sh /etc/cont-init.d/add
...
...
@@ -93,7 +103,6 @@ COPY pam-helper.sh /usr/lib/rstudio-server/bin/pam-helper
EXPOSE
8787
## automatically link a shared volume for kitematic users
#
VOLUME /home/rstudio/kitematic
VOLUME
/home/rstudio/kitematic
CMD
["/init"]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment