Skip to content

Commit a343e37

Browse files
ianpittwoodianpittwood
authored
Merge pull request #907 from rstudio/dev
Merge dev to main
2 parents e1b7e45 + d45353f commit a343e37

File tree

16 files changed

+231
-13
lines changed

16 files changed

+231
-13
lines changed

‎connect/Dockerfile.ubuntu2204

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ ARG QUARTO_VERSION=1.4.557
1212
ARG SCRIPTS_DIR=/opt/positscripts
1313

1414
### Install Quarto ###
15-
RUN QUARTO_VERSION=${QUARTO_VERSION} ${SCRIPTS_DIR}/install_quarto.sh --install-tinytex --add-path-tinytex \
15+
# TODO: Remove `HOME="/opt"` once Quarto supports custom install locations for TinyTeX, see quarto-dev/quarto-cli#11800.
16+
RUN HOME="/opt" QUARTO_VERSION=${QUARTO_VERSION} ${SCRIPTS_DIR}/install_quarto.sh --install-tinytex --add-path-tinytex \
1617
&& ln -s /opt/quarto/${QUARTO_VERSION}/bin/quarto /usr/local/bin/quarto
1718

1819
SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
@@ -45,7 +46,6 @@ RUN apt-get update --fix-missing \
4546
&& apt-get clean \
4647
&& rm -rf /var/lib/apt/lists/*
4748

48-
4949
### Configure Connect ###
5050
EXPOSE 3939/tcp
5151
ENV RSC_LICENSE ""

‎connect/NEWS.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 2025-03-10
2+
3+
- Quarto TinyTeX installation path has been updated from `/root/.TinyTeX` to `/opt/.TinyTeX` to fix potential permission
4+
issues when called from a non-root user. As a result, Quarto will no longer recognize TinyTeX as a managed
5+
installation. This change is not expected to affect the existing functionality of Quarto or TinyTeX for end users.
6+
TinyTeX's relevant packages will still be linked to `/usr/local/bin` as before.
7+
18
# 2024-05-30
29

310
- BREAKING:

‎connect/test/goss.yaml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ package:
1414
installed: true
1515
cracklib-runtime:
1616
installed: true
17+
# Necessary for `tlmgr` to work properly
18+
perl:
19+
installed: true
1720

1821
port:
1922
tcp6:3939:
@@ -49,6 +52,38 @@ file:
4952
/usr/local/bin/quarto:
5053
exists: true
5154
filetype: symlink
55+
/opt/.TinyTeX:
56+
exists: true
57+
filetype: directory
58+
mode: "0755"
59+
/opt/.TinyTeX/bin/x86_64-linux/tlmgr:
60+
exists: true
61+
filetype: symlink
62+
mode: "0777"
63+
linked-to: ../../texmf-dist/scripts/texlive/tlmgr.pl
64+
/opt/.TinyTeX/bin/x86_64-linux/tex:
65+
exists: true
66+
filetype: file
67+
mode: "0755"
68+
/opt/.TinyTeX/bin/x86_64-linux/pdflatex:
69+
exists: true
70+
filetype: symlink
71+
linked-to: pdftex
72+
mode: "0777"
73+
/opt/.TinyTeX/bin/x86_64-linux/pdftex:
74+
exists: true
75+
filetype: file
76+
mode: "0755"
77+
/usr/local/bin/tex:
78+
exists: true
79+
filetype: symlink
80+
linked-to: /opt/.TinyTeX/bin/x86_64-linux/tex
81+
mode: "0777"
82+
/usr/local/bin/pdflatex:
83+
exists: true
84+
filetype: symlink
85+
linked-to: /opt/.TinyTeX/bin/x86_64-linux/pdflatex
86+
mode: "0777"
5287
/tmp/startup.log:
5388
exists: true
5489
contents:
@@ -115,9 +150,12 @@ command:
115150
title: quarto_check
116151
exit-status: 0
117152

153+
118154
# Ensure TinyTeX is installed
119155
"quarto list tools":
120156
title: quarto_tinytex_installed
121157
exit-status: 0
122158
stderr:
123-
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"
159+
- "/tinytex\\s+External Installation/"
160+
# TODO: Reenable this once Quarto supports custom install locations for TinyTeX, see quarto-dev/quarto-cli#11800.
161+
# - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"

‎r-session-complete/Dockerfile.ubuntu2204

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN apt-get update \
2222
libuser \
2323
libuser1-dev \
2424
libpq-dev \
25+
perl \
2526
rrdtool \
2627
strace \
2728
subversion \
@@ -43,7 +44,7 @@ RUN apt-get update \
4344
RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
4445

4546
### Install TinyTeX using Quarto ###
46-
RUN $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
47+
RUN HOME="/opt" $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
4748

4849
RUN /opt/python/"${PYTHON_VERSION}"/bin/python -m venv /opt/python/jupyter \
4950
&& /opt/python/jupyter/bin/python -m pip install --upgrade pip \

‎r-session-complete/NEWS.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 2025.03.11
2+
3+
- Quarto TinyTeX installation path has been updated from `/root/.TinyTeX` to `/opt/.TinyTeX` to fix potential permission
4+
issues when called from a non-root user. As a result, Quarto will no longer recognize TinyTeX as a managed
5+
installation. This change is not expected to affect the existing functionality of Quarto or TinyTeX for end users.
6+
TinyTeX's relevant packages will still be linked to `/usr/local/bin` as before.
7+
18
# 2023.03.1
29
- Update Python VSCode extension to version 2023.6.1
310

‎r-session-complete/test/goss.yaml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
package:
2+
# Necessary for `tlmgr` to work properly
3+
perl:
4+
installed: true
5+
16
file:
27
/usr/lib/rstudio-server:
38
exists: true
@@ -21,6 +26,38 @@ file:
2126
/usr/local/bin/quarto:
2227
exists: true
2328
filetype: symlink
29+
/opt/.TinyTeX:
30+
exists: true
31+
filetype: directory
32+
mode: "0755"
33+
/opt/.TinyTeX/bin/x86_64-linux/tlmgr:
34+
exists: true
35+
filetype: symlink
36+
mode: "0777"
37+
linked-to: ../../texmf-dist/scripts/texlive/tlmgr.pl
38+
/opt/.TinyTeX/bin/x86_64-linux/tex:
39+
exists: true
40+
filetype: file
41+
mode: "0755"
42+
/opt/.TinyTeX/bin/x86_64-linux/pdflatex:
43+
exists: true
44+
filetype: symlink
45+
linked-to: pdftex
46+
mode: "0777"
47+
/opt/.TinyTeX/bin/x86_64-linux/pdftex:
48+
exists: true
49+
filetype: file
50+
mode: "0755"
51+
/usr/local/bin/tex:
52+
exists: true
53+
filetype: symlink
54+
linked-to: /opt/.TinyTeX/bin/x86_64-linux/tex
55+
mode: "0777"
56+
/usr/local/bin/pdflatex:
57+
exists: true
58+
filetype: symlink
59+
linked-to: /opt/.TinyTeX/bin/x86_64-linux/pdflatex
60+
mode: "0777"
2461

2562
command:
2663
"echo '{ \"cells\": [], \"metadata\": {}, \"nbformat\": 4, \"nbformat_minor\": 2}' | /opt/python/jupyter/bin/jupyter nbconvert --to notebook --stdin --stdout":
@@ -66,4 +103,6 @@ command:
66103
title: quarto_tinytex_installed
67104
exit-status: 0
68105
stderr:
69-
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"
106+
- "/tinytex\\s+External Installation/"
107+
# TODO: Reenable this once Quarto supports custom install locations for TinyTeX, see quarto-dev/quarto-cli#11800.
108+
# - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"

‎tools/get-version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ def clean_product_selection(product: str) -> str:
9797

9898

9999
def rstudio_workbench_daily():
100-
version_json = download_json("https://dailies.rstudio.com/rstudio/kousa-dogwood/index.json")
101-
return version_json['workbench']['platforms']['jammy-amd64']['version']
100+
version_json = download_json("https://dailies.rstudio.com/rstudio/latest/index.json")
101+
return version_json['products']['workbench']['platforms']['jammy-amd64']['version']
102102

103103

104104
def download_json(url):

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ RUN curl -fsSL -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_V
100100
RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
101101

102102
### Install TinyTeX using Quarto ###
103-
RUN $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
103+
RUN HOME="/opt" $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
104104

105105
# Workaround to ensure no pre-generated certificates are included in image distributions.
106106
# This happens in the step immediately following Workbench installation in case the certificates are generated.

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

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ package:
2323
installed: true
2424
versions:
2525
- {{.Env.DRIVERS_VERSION}}
26+
# Necessary for `tlmgr` to work properly
27+
perl:
28+
installed: true
2629

2730
port:
2831
tcp:80:
@@ -151,6 +154,38 @@ file:
151154
/usr/local/bin/quarto:
152155
exists: true
153156
filetype: symlink
157+
/opt/.TinyTeX:
158+
exists: true
159+
filetype: directory
160+
mode: "0755"
161+
/opt/.TinyTeX/bin/x86_64-linux/tlmgr:
162+
exists: true
163+
filetype: symlink
164+
mode: "0777"
165+
linked-to: ../../texmf-dist/scripts/texlive/tlmgr.pl
166+
/opt/.TinyTeX/bin/x86_64-linux/tex:
167+
exists: true
168+
filetype: file
169+
mode: "0755"
170+
/opt/.TinyTeX/bin/x86_64-linux/pdflatex:
171+
exists: true
172+
filetype: symlink
173+
linked-to: pdftex
174+
mode: "0777"
175+
/opt/.TinyTeX/bin/x86_64-linux/pdftex:
176+
exists: true
177+
filetype: file
178+
mode: "0755"
179+
/usr/local/bin/tex:
180+
exists: true
181+
filetype: symlink
182+
linked-to: /opt/.TinyTeX/bin/x86_64-linux/tex
183+
mode: "0777"
184+
/usr/local/bin/pdflatex:
185+
exists: true
186+
filetype: symlink
187+
linked-to: /opt/.TinyTeX/bin/x86_64-linux/pdflatex
188+
mode: "0777"
154189

155190

156191
command:
@@ -242,4 +277,6 @@ command:
242277
title: quarto_tinytex_installed
243278
exit-status: 0
244279
stderr:
245-
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"
280+
- "/tinytex\\s+External Installation/"
281+
# TODO: Reenable this once Quarto supports custom install locations for TinyTeX, see quarto-dev/quarto-cli#11800.
282+
# - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ RUN rm -f /etc/rstudio/launcher.pem /etc/rstudio/launcher.pub
6969
RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
7070

7171
### Install TinyTeX using Quarto ###
72-
RUN $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
72+
RUN HOME="/opt" $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
7373

7474
COPY --chmod=0755 license-manager-shim /opt/rstudio-license/license-manager
7575
COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh

‎workbench-for-microsoft-azure-ml/NEWS.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 2025.03.11
2+
3+
- Quarto TinyTeX installation path has been updated from `/root/.TinyTeX` to `/opt/.TinyTeX` to fix potential permission
4+
issues when called from a non-root user. As a result, Quarto will no longer recognize TinyTeX as a managed
5+
installation. This change is not expected to affect the existing functionality of Quarto or TinyTeX for end users.
6+
TinyTeX's relevant packages will still be linked to `/usr/local/bin` as before.
7+
18
# 2024.02.1
29
- Remove R 3.6.3 from image
310
- Bump R versions to latest patches

‎workbench-for-microsoft-azure-ml/deps/apt_packages.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ libxext6
1313
libxrender1
1414
oddjob-mkhomedir
1515
openssh-client
16+
perl
1617
rrdtool
1718
sssd
1819
supervisor

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

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ group:
2121
package:
2222
rstudio-server:
2323
installed: true
24+
# Necessary for `tlmgr` to work properly
25+
perl:
26+
installed: true
2427
# test all system packages
2528
{{range .Vars.syspkgs}}
2629
{{.}}:
@@ -92,6 +95,38 @@ file:
9295
/usr/local/bin/quarto:
9396
exists: true
9497
filetype: symlink
98+
/opt/.TinyTeX:
99+
exists: true
100+
filetype: directory
101+
mode: "0755"
102+
/opt/.TinyTeX/bin/x86_64-linux/tlmgr:
103+
exists: true
104+
filetype: symlink
105+
mode: "0777"
106+
linked-to: ../../texmf-dist/scripts/texlive/tlmgr.pl
107+
/opt/.TinyTeX/bin/x86_64-linux/tex:
108+
exists: true
109+
filetype: file
110+
mode: "0755"
111+
/opt/.TinyTeX/bin/x86_64-linux/pdflatex:
112+
exists: true
113+
filetype: symlink
114+
linked-to: pdftex
115+
mode: "0777"
116+
/opt/.TinyTeX/bin/x86_64-linux/pdftex:
117+
exists: true
118+
filetype: file
119+
mode: "0755"
120+
/usr/local/bin/tex:
121+
exists: true
122+
filetype: symlink
123+
linked-to: /opt/.TinyTeX/bin/x86_64-linux/tex
124+
mode: "0777"
125+
/usr/local/bin/pdflatex:
126+
exists: true
127+
filetype: symlink
128+
linked-to: /opt/.TinyTeX/bin/x86_64-linux/pdflatex
129+
mode: "0777"
95130

96131
command:
97132
"su rstudio-server -c 'touch /var/lib/rstudio-server/monitor/log/rstudio-server.log'":
@@ -160,4 +195,6 @@ command:
160195
title: quarto_tinytex_installed
161196
exit-status: 0
162197
stderr:
163-
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"
198+
- "/tinytex\\s+External Installation/"
199+
# TODO: Reenable this once Quarto supports custom install locations for TinyTeX, see quarto-dev/quarto-cli#11800.
200+
# - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"

‎workbench/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ RUN rm -f /etc/rstudio/launcher.pem /etc/rstudio/launcher.pub
7373
RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
7474

7575
### Install TinyTeX using Quarto ###
76-
RUN $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
76+
RUN HOME="/opt" $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
7777

7878
COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh
7979
COPY startup-launcher/* /startup/launcher/

‎workbench/NEWS.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 2025.03.11
2+
3+
- Quarto TinyTeX installation path has been updated from `/root/.TinyTeX` to `/opt/.TinyTeX` to fix potential permission
4+
issues when called from a non-root user. As a result, Quarto will no longer recognize TinyTeX as a managed
5+
installation. This change is not expected to affect the existing functionality of Quarto or TinyTeX for end users.
6+
TinyTeX's relevant packages will still be linked to `/usr/local/bin` as before.
7+
18
# 2024.09.0
29

310
- Update umask for user home directory from 0022 to 0077 to improve security of directory permissions

0 commit comments

Comments
 (0)