Skip to content

Commit bfbd48e

Browse files
bschwedlerbschwedler
authored
Merge pull request #844 from rstudio/dev
Release Workbench 2024.09.0, including umask changes from dev
2 parents b10466d + 6fc98c6 commit bfbd48e

26 files changed

+47
-76
lines changed

‎Justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BUILDX_PATH := ""
99

1010
RSC_VERSION := "2024.08.0"
1111
RSPM_VERSION := "2024.08.2-9"
12-
RSW_VERSION := "2024.04.2+764.pro1"
12+
RSW_VERSION := "2024.09.0+375.pro3"
1313

1414
DRIVERS_VERSION := "2023.05.0"
1515
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

‎docker-bake.hcl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ variable PACKAGE_MANAGER_VERSION {
88
}
99

1010
variable WORKBENCH_VERSION {
11-
default = "2024.04.2+764.pro1"
11+
default = "2024.09.0+375.pro3"
1212
}
1313

1414
variable DRIVERS_VERSION {
@@ -96,9 +96,8 @@ function get_tags {
9696
variable BASE_BUILD_MATRIX {
9797
default = {
9898
builds = [
99-
{os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.17", py_alternate = "3.8.17"},
100-
{os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.12.1", py_alternate = "3.11.7"},
10199
{os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.1", py_alternate = "3.11.7"},
100+
{os = "ubuntu2204", r_primary = "4.4.1", r_alternate = "4.3.3", py_primary = "3.12.6", py_alternate = "3.11.10"},
102101
]
103102
}
104103
}
@@ -168,31 +167,31 @@ variable CONTENT_BUILD_MATRIX {
168167
variable R_SESSION_COMPLETE_BUILD_MATRIX {
169168
default = {
170169
builds = [
171-
{os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.1", py_alternate = "3.11.7"},
170+
{os = "ubuntu2204", r_primary = "4.4.1", r_alternate = "4.3.3", py_primary = "3.12.6", py_alternate = "3.11.10"},
172171
]
173172
}
174173
}
175174

176175
variable WORKBENCH_BUILD_MATRIX {
177176
default = {
178177
builds = [
179-
{os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.1", py_alternate = "3.11.7"},
178+
{os = "ubuntu2204", r_primary = "4.4.1", r_alternate = "4.3.3", py_primary = "3.12.6", py_alternate = "3.11.10"},
180179
]
181180
}
182181
}
183182

184183
variable WORKBENCH_GOOGLE_CLOUD_WORKSTATION_BUILD_MATRIX {
185184
default = {
186185
builds = [
187-
{os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.1", py_alternate = "3.11.7"},
186+
{os = "ubuntu2204", r_primary = "4.4.1", r_alternate = "4.3.3", py_primary = "3.12.6", py_alternate = "3.11.10"},
188187
]
189188
}
190189
}
191190

192191
variable WORKBENCH_MICROSOFT_AZURE_ML_BUILD_MATRIX {
193192
default = {
194193
builds = [
195-
{os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.17", py_alternate = "3.8.17"},
194+
{os = "ubuntu2204", r_primary = "4.4.1", r_alternate = "4.3.3", py_primary = "3.12.6", py_alternate = "3.11.10"},
196195
]
197196
}
198197
}

‎r-session-complete/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
R_VERSION=4.1.0
22
PYTHON_VERSION=3.9.5
3-
RSW_VERSION=2024.04.2+764.pro1
3+
RSW_VERSION=2024.09.0+375.pro3
44
DRIVERS_VERSION=2024.03.0-1

‎r-session-complete/Dockerfile.ubuntu2204

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG R_VERSION_ALT=4.3.3
66
ARG PYTHON_VERSION=3.9.17
77
ARG PYTHON_VERSION_ALT=3.8.17
88
ARG JUPYTERLAB_VERSION=3.6.5
9-
ARG RSW_VERSION=2024.04.2+764.pro1
9+
ARG RSW_VERSION=2024.09.0+375.pro3
1010
ARG RSW_NAME=rstudio-workbench
1111
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
1212
ARG SCRIPTS_DIR=/opt/positscripts
@@ -43,10 +43,6 @@ RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
4343
### Install TinyTeX using Quarto ###
4444
RUN $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
4545

46-
COPY maybe_install_vs_code.sh /tmp/maybe_install_vs_code.sh
47-
RUN /tmp/maybe_install_vs_code.sh \
48-
&& rm /tmp/maybe_install_vs_code.sh
49-
5046
RUN /opt/python/"${PYTHON_VERSION}"/bin/pip install \
5147
jupyter \
5248
jupyterlab=="${JUPYTERLAB_VERSION}" \

‎r-session-complete/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# Supported tags and respective Dockerfile links
99

10-
* [`jammy`, `ubuntu2204`, `jammy-2024.04.2`, `ubuntu2204-2024.04.2`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
10+
* [`jammy`, `ubuntu2204`, `jammy-2024.09.0`, `ubuntu2204-2024.09.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
1111

1212
# What are the r-session-complete images?
1313

‎r-session-complete/maybe_install_vs_code.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎workbench-for-google-cloud-workstations/.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
RSW_VERSION=2024.04.2+764.pro1
2-
RSW_TAG_VERSION=2024.04.2-764.pro1
1+
RSW_VERSION=2024.09.0+375.pro3
2+
RSW_TAG_VERSION=2024.09.0-375.pro3
33
RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
44
RSW_NAME=rstudio-workbench
55
PYTHON_VERSION=3.11.9

‎workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG PYTHON_VERSION_ALT=3.10.14
1010
ARG PYTHON_VERSION_JUPYTER=3.10.14
1111
ARG JUPYTERLAB_VERSION=3.6.7
1212
ARG DRIVERS_VERSION=2023.05.0
13-
ARG RSW_VERSION=2024.04.2+764.pro1
13+
ARG RSW_VERSION=2024.09.0+375.pro3
1414
ARG RSW_NAME=rstudio-workbench
1515
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
1616
ARG SCRIPTS_DIR=/opt/positscripts
@@ -141,7 +141,7 @@ ADD --chmod=755 https://raw.githubusercontent.com/rstudio/wait-for-it/master/wai
141141
RUN mkdir -p /var/lib/rstudio-server/monitor/log \
142142
&& chown -R rstudio-server:rstudio-server /var/lib/rstudio-server/monitor \
143143
&& mkdir -p /startup/custom/ \
144-
&& printf '\n# allow home directory creation\nsession required pam_mkhomedir.so skel=/etc/skel umask=0027' >> /etc/pam.d/common-session
144+
&& printf '\n# allow home directory creation\nsession required pam_mkhomedir.so skel=/etc/skel umask=0077' >> /etc/pam.d/common-session
145145

146146
COPY --chmod=755 TurboActivate.dat /opt/rstudio-license/license-manager.conf
147147
COPY --chmod=755 license-manager-shim /opt/rstudio-license/license-manager

‎workbench-for-google-cloud-workstations/conf/launcher.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ port=5559
44
server-user=rstudio-server
55
admin-group=rstudio-server
66
authorization-enabled=1
7-
enable-debug-logging=1
87

98
[cluster]
109
name=Local

‎workbench-for-google-cloud-workstations/conf/vscode.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
enabled=1
2-
args=--verbose --host=0.0.0.0
2+
args=--host=0.0.0.0
33

4-
# exe=/usr/lib/rstudio-server/bin/code-server/bin/code-server
4+
# exe=/usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server

‎workbench-for-google-cloud-workstations/pam/rstudio-session

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ password sufficient pam_sss.so use_authtok
1717
password required pam_unix.so try_first_pass nullok sha512 shadow
1818
password optional pam_permit.so
1919

20-
session required pam_mkhomedir.so skel=/etc/skel umask=0027
20+
session required pam_mkhomedir.so skel=/etc/skel umask=0077
2121
session required pam_env.so readenv=1
2222
session required pam_env.so readenv=1 envfile=/etc/default/locale
2323
session required pam_limits.so

‎workbench-for-google-cloud-workstations/test/goss.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,11 @@ file:
7070
exists: true
7171
owner: rstudio-server
7272
group: rstudio-server
73-
/usr/lib/rstudio-server/bin/code-server/bin/code-server:
73+
/usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
7474
exists: true
75+
# Old code-server location
76+
/usr/lib/rstudio-server/bin/code-server/bin/code-server:
77+
exists: false
7578
/etc/rstudio/vscode.conf:
7679
exists: true
7780
/etc/rstudio/jupyter.conf:
@@ -106,7 +109,7 @@ file:
106109
/etc/pam.d/common-session:
107110
exists: true
108111
contents:
109-
- "/^session required pam_mkhomedir.so skel=/etc/skel umask=0027$/"
112+
- "/^session required pam_mkhomedir.so skel=/etc/skel umask=0077$/"
110113
/etc/sssd/sssd.conf:
111114
exists: true
112115
owner: root

‎workbench-for-microsoft-azure-ml/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RSW_VERSION=2024.04.2+764.pro1
1+
RSW_VERSION=2024.09.0+375.pro3
22
RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
33
RSW_NAME=rstudio-workbench
44
PYTHON_VERSION=3.9.14

‎workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG PYTHON_VERSION=3.9.17
77
ARG PYTHON_VERSION_ALT=3.8.17
88
ARG PYTHON_VERSION_JUPYTER=3.8.17
99
ARG JUPYTERLAB_VERSION=3.6.7
10-
ARG RSW_VERSION=2024.04.2+764.pro1
10+
ARG RSW_VERSION=2024.09.0+375.pro3
1111
ARG RSW_NAME=rstudio-workbench
1212
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
1313
ARG SCRIPTS_DIR=/opt/positscripts
@@ -187,5 +187,5 @@ LABEL \
187187
azure.ii.endpoints='[{"label":"connect","target":8787,"protocol":"http"}]' \
188188
org.opencontainers.image.description='A professional integrated development environment for data science teams using R and Python' \
189189
org.opencontainers.image.title='RStudio Workbench' \
190-
org.opencontainers.image.version='2024.04.2+764.pro1' \
190+
org.opencontainers.image.version='2024.09.0+375.pro3' \
191191
org.opencontainers.image.url='https://www.rstudio.com/products/workbench/'

‎workbench-for-microsoft-azure-ml/conf/launcher.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ server-user=rstudio-server
55
admin-group=rstudio-server
66
authorization-enabled=1
77
thread-pool-size=4
8-
enable-debug-logging=1
98

109
[cluster]
1110
name=Local

‎workbench-for-microsoft-azure-ml/conf/vscode.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
enabled=1
2-
exe=/opt/code-server/bin/code-server
3-
args=--verbose --host=0.0.0.0
2+
args=--host=0.0.0.0
3+
4+
# exe=/usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server

‎workbench-for-microsoft-azure-ml/test/goss.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,11 @@ file:
7878
exists: true
7979
owner: rstudio-server
8080
group: rstudio-server
81-
/usr/lib/rstudio-server/bin/code-server/bin/code-server:
81+
/usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
8282
exists: true
83+
# Old code-server location
84+
/usr/lib/rstudio-server/bin/code-server/bin/code-server:
85+
exists: false
8386
/etc/rstudio/vscode.conf:
8487
exists: true
8588
/tmp/startup.log:

‎workbench/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RSW_VERSION=2024.04.2+764.pro1
1+
RSW_VERSION=2024.09.0+375.pro3
22
RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
33
RSW_NAME=rstudio-workbench
44
PYTHON_VERSION=3.9.17

‎workbench/Dockerfile.ubuntu2204

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG PYTHON_VERSION=3.9.17
77
ARG PYTHON_VERSION_ALT=3.8.17
88
ARG PYTHON_VERSION_JUPYTER=3.8.17
99
ARG JUPYTERLAB_VERSION=3.6.7
10-
ARG RSW_VERSION=2024.04.2+764.pro1
10+
ARG RSW_VERSION=2024.09.0+375.pro3
1111
ARG RSW_NAME=rstudio-workbench
1212
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
1313
ARG SCRIPTS_DIR=/opt/positscripts
@@ -73,10 +73,6 @@ RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
7373
### Install TinyTeX using Quarto ###
7474
RUN $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
7575

76-
COPY maybe_install_vs_code.sh /tmp/maybe_install_vs_code.sh
77-
RUN /tmp/maybe_install_vs_code.sh \
78-
&& rm /tmp/maybe_install_vs_code.sh
79-
8076
COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh
8177
COPY startup-launcher/* /startup/launcher/
8278
COPY startup-user-provisioning/* /startup/user-provisioning/
@@ -107,7 +103,7 @@ COPY conf/* /etc/rstudio/
107103
RUN mkdir -p /var/lib/rstudio-server/monitor/log && \
108104
chown -R rstudio-server:rstudio-server /var/lib/rstudio-server/monitor && \
109105
mkdir -p /startup/custom/ && \
110-
printf '\n# allow home directory creation\nsession required pam_mkhomedir.so skel=/etc/skel umask=0027' >> /etc/pam.d/common-session
106+
printf '\n# allow home directory creation\nsession required pam_mkhomedir.so skel=/etc/skel umask=0077' >> /etc/pam.d/common-session
111107

112108
EXPOSE 8787/tcp
113109
EXPOSE 5559/tcp

‎workbench/NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
# 2024.09.0
2+
3+
- Update umask for user home directory from 0022 to 0077 to improve security of directory permissions
4+
15
# 2023.03.1
6+
27
- No changes
38

49
# 2023.03.0

‎workbench/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# Supported tags and respective Dockerfile links
99

10-
* [`jammy`, `ubuntu2204`, `jammy-2024.04.2`, `ubuntu2204-2024.04.2`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)
10+
* [`jammy`, `ubuntu2204`, `jammy-2024.09.0`, `ubuntu2204-2024.09.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)
1111

1212
# What is RStudio Workbench?
1313

‎workbench/conf/launcher.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ server-user=rstudio-server
55
admin-group=rstudio-server
66
authorization-enabled=1
77
thread-pool-size=4
8-
enable-debug-logging=1
98

109
[cluster]
1110
name=Local

‎workbench/conf/vscode.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
enabled=1
2-
args=--verbose --host=0.0.0.0
2+
args=--host=0.0.0.0
33

4-
# exe=/usr/lib/rstudio-server/bin/code-server/bin/code-server
4+
# exe=/usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server

‎workbench/maybe_install_vs_code.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎workbench/pam/rstudio-session

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ password sufficient pam_sss.so use_authtok
1717
password required pam_unix.so try_first_pass nullok sha512 shadow
1818
password optional pam_permit.so
1919

20-
session required pam_mkhomedir.so skel=/etc/skel umask=0027
20+
session required pam_mkhomedir.so skel=/etc/skel umask=0077
2121
session required pam_env.so readenv=1
2222
session required pam_env.so readenv=1 envfile=/etc/default/locale
2323
session required pam_limits.so

‎workbench/test/goss.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,11 @@ file:
6969
exists: true
7070
owner: rstudio-server
7171
group: rstudio-server
72-
{{ $version_split := split "." .Env.RSW_VERSION }}
73-
{{ if or (ge ($version_split._0 | atoi) 2025) (and (ge ($version_split._0 | atoi) 2024) (ge ($version_split._1 | atoi) 7)) }}
7472
/usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
7573
exists: true
76-
{{ else }}
74+
# Old code-server location
7775
/usr/lib/rstudio-server/bin/code-server/bin/code-server:
78-
exists: true
79-
{{ end }}
76+
exists: false
8077
/var/lib/rstudio-launcher/Local/jobs/buildkitsandbox:
8178
exists: false
8279
/etc/rstudio/vscode.conf:
@@ -88,7 +85,7 @@ file:
8885
/etc/pam.d/common-session:
8986
exists: true
9087
contains:
91-
- "/^session required pam_mkhomedir.so skel=/etc/skel umask=0027$/"
88+
- "/^session required pam_mkhomedir.so skel=/etc/skel umask=0077$/"
9289
/etc/sssd/sssd.conf:
9390
exists: true
9491
owner: root

0 commit comments

Comments
 (0)