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
9af818c8
Commit
9af818c8
authored
6 years ago
by
Carl Boettiger
Browse files
Options
Downloads
Patches
Plain Diff
rstudio-server version pinning
parent
427c4733
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+6
-6
6 additions, 6 deletions
Makefile
VERSIONS.md
+2
-1
2 additions, 1 deletion
VERSIONS.md
rstudio/3.5.0/Dockerfile
+1
-1
1 addition, 1 deletion
rstudio/3.5.0/Dockerfile
rstudio/3.5.1/Dockerfile
+1
-1
1 addition, 1 deletion
rstudio/3.5.1/Dockerfile
with
10 additions
and
9 deletions
Makefile
+
6
−
6
View file @
9af818c8
all
:
all
:
make
sync
r-ver rstudio tidyverse verse
r-ver
:
.PHONY
r-ver
:
.PHONY
make
-C
r-ver/ latest
rstudio
:
.PHONY
make
-C
rstudio/ latest
tidyverse
:
.PHONY
tidyverse
:
.PHONY
make
-C
tidyverse/ latest
verse
:
.PHONY
verse
:
.PHONY
make
-C
verse/ latest
sync
:
make
-C
r-ver/
sync
make
-C
r-ver/
sync
make
-C
rstudio/
sync
make
-C
tidyverse/
sync
make
-C
verse/
sync
...
...
@@ -21,7 +21,7 @@ sync:
clean
::
make
-C
r-ver/ clean
make
-C
r-ver/ clean
make
-C
rstudio/ clean
make
-C
tidyverse/ clean
make
-C
verse/ clean
...
...
This diff is collapsed.
Click to expand it.
VERSIONS.md
+
2
−
1
View file @
9af818c8
...
...
@@ -39,7 +39,8 @@ docker build --build-arg RSTUDIO_VERSION=1.1.414 -t rocker/rstudio:3.4.2 .
| 3.4.2 | 2017-11-30 | 1.1.383 | 2017-10-09 |
| 3.4.3 | 2017-03-15 | 1.1.442 | 2018-03-12 |
| 3.4.4 | 2018-04-23 | 1.1.447 | 2018-04-18 |
| 3.5.0 | latest | latest | latest |
| 3.5.0 | 2018-07-02 | 1.1.447 | 2018-04-18 |
| 3.5.1 | latest | latest | latest |
**
The old rule where
`rocker/rstudio`
was build, by default, using the latest
RStudio Server is cancelled
**
, since RStudio ships with
`rmarkdown`
package.
...
...
This diff is collapsed.
Click to expand it.
rstudio/3.5.0/Dockerfile
+
1
−
1
View file @
9af818c8
...
...
@@ -2,7 +2,7 @@ FROM rocker/r-ver:3.5.0
ARG
RSTUDIO_VERSION
## Comment the next line to use the latest RStudio Server version by default
#
ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.447}
ENV
RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.447}
ENV
PATH=/usr/lib/rstudio-server/bin:$PATH
## Download and install RStudio server & dependencies
...
...
This diff is collapsed.
Click to expand it.
rstudio/3.5.1/Dockerfile
+
1
−
1
View file @
9af818c8
...
...
@@ -2,7 +2,7 @@ FROM rocker/r-ver:3.5.1
ARG
RSTUDIO_VERSION
## Comment the next line to use the latest RStudio Server version by default
#
ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.4
47
}
ENV
RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.4
56
}
ENV
PATH=/usr/lib/rstudio-server/bin:$PATH
## Download and install RStudio server & dependencies
...
...
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