Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump s6 overlay to v2.1.0.2 in R <= 4.0.2 images #247

Merged
merged 1 commit into from
Sep 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockerfiles/ml_4.0.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v2.0.0.1
ENV S6_VERSION=v2.1.0.2
ENV RSTUDIO_VERSION=1.3.959
ENV DEFAULT_USER=rstudio
ENV PANDOC_VERSION=default
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/ml_4.0.1.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v2.0.0.1
ENV S6_VERSION=v2.1.0.2
ENV RSTUDIO_VERSION=1.3.959
ENV DEFAULT_USER=rstudio
ENV PANDOC_VERSION=default
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/ml_4.0.2.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v2.0.0.1
ENV S6_VERSION=v2.1.0.2
ENV RSTUDIO_VERSION=1.3.1093
ENV DEFAULT_USER=rstudio
ENV PANDOC_VERSION=default
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/rstudio-ubuntu18.04_4.0.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v1.21.7.0
ENV S6_VERSION=v2.1.0.2
ENV RSTUDIO_VERSION=1.3.959
ENV DEFAULT_USER=rstudio
ENV PATH=/usr/lib/rstudio-server/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/rstudio_4.0.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v2.0.0.1
ENV S6_VERSION=v2.1.0.2
ENV RSTUDIO_VERSION=1.3.959
ENV DEFAULT_USER=rstudio
ENV PATH=/usr/lib/rstudio-server/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/rstudio_4.0.1.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v2.0.0.1
ENV S6_VERSION=v2.1.0.2
ENV RSTUDIO_VERSION=1.3.959
ENV DEFAULT_USER=rstudio
ENV PATH=/usr/lib/rstudio-server/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/rstudio_4.0.2.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v2.0.0.1
ENV S6_VERSION=v2.1.0.2
ENV RSTUDIO_VERSION=1.3.1093
ENV DEFAULT_USER=rstudio
ENV PATH=/usr/lib/rstudio-server/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/shiny_4.0.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v2.0.0.1
ENV S6_VERSION=v2.1.0.2
ENV SHINY_SERVER_VERSION=latest
ENV PANDOC_VERSION=default

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/shiny_4.0.1.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v2.0.0.1
ENV S6_VERSION=v2.1.0.2
ENV SHINY_SERVER_VERSION=latest
ENV PANDOC_VERSION=default

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/shiny_4.0.2.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
org.opencontainers.image.vendor="Rocker Project" \
org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"

ENV S6_VERSION=v2.0.0.1
ENV S6_VERSION=v2.1.0.2
ENV SHINY_SERVER_VERSION=latest
ENV PANDOC_VERSION=default

Expand Down
8 changes: 4 additions & 4 deletions stacks/4.0.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"FROM": "rocker/r-ver:4.0.0",
"ENV": {
"S6_VERSION": "v2.0.0.1",
"S6_VERSION": "v2.1.0.2",
"RSTUDIO_VERSION": "1.3.959",
"DEFAULT_USER": "rstudio",
"PATH": "/usr/lib/rstudio-server/bin:$PATH"
Expand Down Expand Up @@ -115,7 +115,7 @@
},
"FROM": "rocker/r-ver:4.0.0",
"ENV": {
"S6_VERSION": "v2.0.0.1",
"S6_VERSION": "v2.1.0.2",
"SHINY_SERVER_VERSION": "latest",
"PANDOC_VERSION": "default"
},
Expand Down Expand Up @@ -204,7 +204,7 @@
},
"FROM": "rocker/cuda:4.0.0",
"ENV": {
"S6_VERSION": "v2.0.0.1",
"S6_VERSION": "v2.1.0.2",
"RSTUDIO_VERSION": "1.3.959",
"DEFAULT_USER": "rstudio",
"PANDOC_VERSION": "default",
Expand Down Expand Up @@ -275,7 +275,7 @@
},
"FROM": "rocker/r-ver:4.0.0-ubuntu18.04",
"ENV": {
"S6_VERSION": "v1.21.7.0",
"S6_VERSION": "v2.1.0.2",
"RSTUDIO_VERSION": "1.3.959",
"DEFAULT_USER": "rstudio",
"PATH": "/usr/lib/rstudio-server/bin:$PATH"
Expand Down
6 changes: 3 additions & 3 deletions stacks/4.0.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"FROM": "rocker/r-ver:4.0.1",
"ENV": {
"S6_VERSION": "v2.0.0.1",
"S6_VERSION": "v2.1.0.2",
"RSTUDIO_VERSION": "1.3.959",
"DEFAULT_USER": "rstudio",
"PATH": "/usr/lib/rstudio-server/bin:$PATH"
Expand Down Expand Up @@ -101,7 +101,7 @@
},
"FROM": "rocker/r-ver:4.0.1",
"ENV": {
"S6_VERSION": "v2.0.0.1",
"S6_VERSION": "v2.1.0.2",
"SHINY_SERVER_VERSION": "latest",
"PANDOC_VERSION": "default"
},
Expand Down Expand Up @@ -190,7 +190,7 @@
},
"FROM": "rocker/cuda:4.0.1",
"ENV": {
"S6_VERSION": "v2.0.0.1",
"S6_VERSION": "v2.1.0.2",
"RSTUDIO_VERSION": "1.3.959",
"DEFAULT_USER": "rstudio",
"PANDOC_VERSION": "default",
Expand Down
6 changes: 3 additions & 3 deletions stacks/4.0.2.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"FROM": "rocker/r-ver:4.0.2",
"ENV": {
"S6_VERSION": "v2.0.0.1",
"S6_VERSION": "v2.1.0.2",
"RSTUDIO_VERSION": "1.3.1093",
"DEFAULT_USER": "rstudio",
"PATH": "/usr/lib/rstudio-server/bin:$PATH"
Expand Down Expand Up @@ -101,7 +101,7 @@
},
"FROM": "rocker/r-ver:4.0.2",
"ENV": {
"S6_VERSION": "v2.0.0.1",
"S6_VERSION": "v2.1.0.2",
"SHINY_SERVER_VERSION": "latest",
"PANDOC_VERSION": "default"
},
Expand Down Expand Up @@ -190,7 +190,7 @@
},
"FROM": "rocker/cuda:4.0.2",
"ENV": {
"S6_VERSION": "v2.0.0.1",
"S6_VERSION": "v2.1.0.2",
"RSTUDIO_VERSION": "1.3.1093",
"DEFAULT_USER": "rstudio",
"PANDOC_VERSION": "default",
Expand Down