Skip to content

Commit abe3eb3

Browse files
mattocci27mattocci27
committed
test
1 parent 3daf9ed commit abe3eb3

File tree

4 files changed

+170
-168
lines changed

4 files changed

+170
-168
lines changed

‎images.json

+8
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
"libglpk-dev",
1414
"libxml2-dev",
1515
"libzmq3-dev",
16+
"libfontconfig1-dev",
17+
"libharfbuzz-dev",
18+
"libfribidi-dev",
19+
"libfreetype6-dev",
20+
"libpng-dev",
21+
"libtiff5-dev",
22+
"libjpeg-dev",
23+
"libgit2-dev",
1624
"libxt6",
1725
"python3-dev",
1826
"python3-pip"

‎images/radian-verse_4.3.2/Dockerfile

+77-84
Original file line numberDiff line numberDiff line change
@@ -24,90 +24,83 @@ RUN echo "PATH=${PATH}" >> ${R_HOME}/etc/Renviron
2424
RUN install2.r -n -2 --skipinstalled --error \
2525
tinytex
2626

27-
RUN wget -qO- "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
28-
&& mv ~/.TinyTeX/ /opt/TinyTeX
29-
30-
ENV PATH="/opt/TinyTeX/bin/x86_64-linux:$PATH"
31-
32-
RUN /opt/TinyTeX/bin/*/tlmgr path add \
33-
&& tlmgr install \
34-
ae \
35-
amsmath \
36-
babel-english \
37-
bigintcalc \
38-
bitset \
39-
bookmark \
40-
booktabs \
41-
caption \
42-
colortbl \
43-
csquotes \
44-
environ \
45-
epstopdf-pkg \
46-
etexcmds \
47-
fancyhdr \
48-
float \
49-
footnotebackref \
50-
fvextra \
51-
geometry \
52-
gettitlestring \
53-
hycolor \
54-
hyperref \
55-
inconsolata \
56-
intcalc \
57-
koma-script \
58-
kvdefinekeys \
59-
kvsetkeys \
60-
latex-amsmath-dev \
61-
latexmk \
62-
letltxmacro \
63-
lineno \
64-
listings \
65-
ltxcmds \
66-
ly1 \
67-
makecell \
68-
mdframed \
69-
mdwtools \
70-
metafont \
71-
mfware \
72-
multirow \
73-
needspace \
74-
oberdiek \
75-
parskip \
76-
pdfcol \
77-
pdfcrop \
78-
pdfescape \
79-
pdflscape \
80-
pgf \
81-
refcount \
82-
rerunfilecheck \
83-
setspace \
84-
sourcecodepro \
85-
sourcesanspro \
86-
stringenc \
87-
tabu \
88-
tcolorbox \
89-
tex \
90-
threeparttable \
91-
threeparttablex \
92-
titling \
93-
trimspaces \
94-
ulem \
95-
uniquecounter \
96-
upquote \
97-
varwidth \
98-
wrapfig \
99-
xcolor \
100-
zapfding \
101-
zref \
102-
&& tlmgr path add \
103-
&& Rscript -e "tinytex::r_texmf()" \
104-
&& chown -R root:staff /opt/TinyTeX \
105-
&& chmod -R g+w /opt/TinyTeX \
106-
&& chmod -R g+wx /opt/TinyTeX/bin
107-
#ae inconsolata listings metafont mfware parskip pdfcrop tex \
108-
# RUN wget -qO- \
109-
# "https://github.com/yihui/tinytex/raw/main/tools/install-unx.sh" | \
110-
# TINYTEX_DIR=${TINYTEX_DIR} sh -s - --admin --no-path
27+
USER rstudio
28+
29+
RUN R -e "tinytex::install_tinytex()"
30+
31+
ENV PATH="/home/rstudio/bin/:$PATH"
32+
33+
RUN R -e "tinytex::tlmgr_install( \
34+
c('ae', \
35+
'amsmath', \
36+
'babel-english', \
37+
'bigintcalc', \
38+
'bitset', \
39+
'bookmark', \
40+
'booktabs', \
41+
'caption', \
42+
'colortbl', \
43+
'csquotes', \
44+
'environ', \
45+
'epstopdf-pkg', \
46+
'etexcmds', \
47+
'fancyhdr', \
48+
'float', \
49+
'footnotebackref', \
50+
'fvextra', \
51+
'geometry', \
52+
'gettitlestring', \
53+
'hycolor', \
54+
'hyperref', \
55+
'inconsolata', \
56+
'intcalc', \
57+
'koma-script', \
58+
'kvdefinekeys', \
59+
'kvsetkeys', \
60+
'latex-amsmath-dev', \
61+
'latexmk', \
62+
'letltxmacro', \
63+
'lineno', \
64+
'listings', \
65+
'ltxcmds', \
66+
'ly1', \
67+
'makecell', \
68+
'mdframed', \
69+
'mdwtools', \
70+
'metafont', \
71+
'mfware', \
72+
'multirow', \
73+
'needspace', \
74+
'oberdiek', \
75+
'parskip', \
76+
'pdfcol', \
77+
'pdfcrop', \
78+
'pdfescape', \
79+
'pdflscape', \
80+
'pgf', \
81+
'refcount', \
82+
'rerunfilecheck', \
83+
'setspace', \
84+
'sourcecodepro', \
85+
'sourcesanspro', \
86+
'stringenc', \
87+
'tabu', \
88+
'tcolorbox', \
89+
'tex', \
90+
'threeparttable', \
91+
'threeparttablex', \
92+
'titling', \
93+
'trimspaces', \
94+
'ulem', \
95+
'uniquecounter', \
96+
'upquote', \
97+
'varwidth', \
98+
'wrapfig', \
99+
'xcolor', \
100+
'zapfding', \
101+
'zref'))"
102+
103+
USER root
111104

112105

113106
ENV QUARTO_VERSION=1.4.550

‎images/radian_4.3.2/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ RUN apt-get update -q -y \
1010
libglpk-dev \
1111
libxml2-dev \
1212
libzmq3-dev \
13+
libfontconfig1-dev \
14+
libharfbuzz-dev \
15+
libfribidi-dev \
16+
libfreetype6-dev \
17+
libpng-dev \
18+
libtiff5-dev \
19+
libjpeg-dev \
20+
libgit2-dev \
1321
libxt6 \
1422
python3-dev \
1523
python3-pip \

‎templates/Dockerfile.jinja

+77-84
Original file line numberDiff line numberDiff line change
@@ -45,90 +45,83 @@ RUN echo "PATH=${PATH}" >> ${R_HOME}/etc/Renviron
4545
RUN install2.r -n -2 --skipinstalled --error \
4646
tinytex
4747

48-
RUN wget -qO- "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
49-
&& mv ~/.TinyTeX/ /opt/TinyTeX
50-
51-
ENV PATH="/opt/TinyTeX/bin/x86_64-linux:$PATH"
52-
53-
RUN /opt/TinyTeX/bin/*/tlmgr path add \
54-
&& tlmgr install \
55-
ae \
56-
amsmath \
57-
babel-english \
58-
bigintcalc \
59-
bitset \
60-
bookmark \
61-
booktabs \
62-
caption \
63-
colortbl \
64-
csquotes \
65-
environ \
66-
epstopdf-pkg \
67-
etexcmds \
68-
fancyhdr \
69-
float \
70-
footnotebackref \
71-
fvextra \
72-
geometry \
73-
gettitlestring \
74-
hycolor \
75-
hyperref \
76-
inconsolata \
77-
intcalc \
78-
koma-script \
79-
kvdefinekeys \
80-
kvsetkeys \
81-
latex-amsmath-dev \
82-
latexmk \
83-
letltxmacro \
84-
lineno \
85-
listings \
86-
ltxcmds \
87-
ly1 \
88-
makecell \
89-
mdframed \
90-
mdwtools \
91-
metafont \
92-
mfware \
93-
multirow \
94-
needspace \
95-
oberdiek \
96-
parskip \
97-
pdfcol \
98-
pdfcrop \
99-
pdfescape \
100-
pdflscape \
101-
pgf \
102-
refcount \
103-
rerunfilecheck \
104-
setspace \
105-
sourcecodepro \
106-
sourcesanspro \
107-
stringenc \
108-
tabu \
109-
tcolorbox \
110-
tex \
111-
threeparttable \
112-
threeparttablex \
113-
titling \
114-
trimspaces \
115-
ulem \
116-
uniquecounter \
117-
upquote \
118-
varwidth \
119-
wrapfig \
120-
xcolor \
121-
zapfding \
122-
zref \
123-
&& tlmgr path add \
124-
&& Rscript -e "tinytex::r_texmf()" \
125-
&& chown -R root:staff /opt/TinyTeX \
126-
&& chmod -R g+w /opt/TinyTeX \
127-
&& chmod -R g+wx /opt/TinyTeX/bin
128-
#ae inconsolata listings metafont mfware parskip pdfcrop tex \
129-
# RUN wget -qO- \
130-
# "https://github.com/yihui/tinytex/raw/main/tools/install-unx.sh" | \
131-
# TINYTEX_DIR=${TINYTEX_DIR} sh -s - --admin --no-path
48+
USER rstudio
49+
50+
RUN R -e "tinytex::install_tinytex()"
51+
52+
ENV PATH="/home/rstudio/bin/:$PATH"
53+
54+
RUN R -e "tinytex::tlmgr_install( \
55+
c('ae', \
56+
'amsmath', \
57+
'babel-english', \
58+
'bigintcalc', \
59+
'bitset', \
60+
'bookmark', \
61+
'booktabs', \
62+
'caption', \
63+
'colortbl', \
64+
'csquotes', \
65+
'environ', \
66+
'epstopdf-pkg', \
67+
'etexcmds', \
68+
'fancyhdr', \
69+
'float', \
70+
'footnotebackref', \
71+
'fvextra', \
72+
'geometry', \
73+
'gettitlestring', \
74+
'hycolor', \
75+
'hyperref', \
76+
'inconsolata', \
77+
'intcalc', \
78+
'koma-script', \
79+
'kvdefinekeys', \
80+
'kvsetkeys', \
81+
'latex-amsmath-dev', \
82+
'latexmk', \
83+
'letltxmacro', \
84+
'lineno', \
85+
'listings', \
86+
'ltxcmds', \
87+
'ly1', \
88+
'makecell', \
89+
'mdframed', \
90+
'mdwtools', \
91+
'metafont', \
92+
'mfware', \
93+
'multirow', \
94+
'needspace', \
95+
'oberdiek', \
96+
'parskip', \
97+
'pdfcol', \
98+
'pdfcrop', \
99+
'pdfescape', \
100+
'pdflscape', \
101+
'pgf', \
102+
'refcount', \
103+
'rerunfilecheck', \
104+
'setspace', \
105+
'sourcecodepro', \
106+
'sourcesanspro', \
107+
'stringenc', \
108+
'tabu', \
109+
'tcolorbox', \
110+
'tex', \
111+
'threeparttable', \
112+
'threeparttablex', \
113+
'titling', \
114+
'trimspaces', \
115+
'ulem', \
116+
'uniquecounter', \
117+
'upquote', \
118+
'varwidth', \
119+
'wrapfig', \
120+
'xcolor', \
121+
'zapfding', \
122+
'zref'))"
123+
124+
USER root
132125

133126
{% endif %}
134127

0 commit comments

Comments
 (0)