Skip to content

Commit 8d8c866

Browse files
committed
feat: updated to R version 4.1.3
1 parent 5c51190 commit 8d8c866

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Version:
2-
VERSION_TAG=4.1.2-9019
2+
VERSION_TAG=4.1.3
33

44
## Ports:
55
COMPOSE_PROJECT_NAME=rdatascience_1

Dockerfiles/rdsc_base_j.dockerfile

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
207207
psmisc \
208208
qpdf \
209209
littler \
210+
r-cran-littler \
210211
r-base \
211212
r-base-dev \
213+
r-base-core \
212214
r-recommended \
213215
tcl8.6-dev \
214216
texinfo \
215217
tk8.6-dev \
216-
wajig && \
218+
wajig \
219+
&& ln -s /usr/lib/R/site-library/littler/examples/install.r /usr/local/bin/install.r \
220+
&& ln -s /usr/lib/R/site-library/littler/examples/install2.r /usr/local/bin/install2.r \
221+
&& ln -s /usr/lib/R/site-library/littler/examples/installBioc.r /usr/local/bin/installBioc.r \
222+
&& ln -s /usr/lib/R/site-library/littler/examples/installDeps.r /usr/local/bin/installDeps.r \
223+
&& ln -s /usr/lib/R/site-library/littler/examples/installGithub.r /usr/local/bin/installGithub.r \
224+
&& ln -s /usr/lib/R/site-library/littler/examples/testInstalled.r /usr/local/bin/testInstalled.r \
217225
# clear caches
218-
rm -rf /var/lib/apt/lists/* && \
219-
rm -rf /tmp/* && \
220-
rm -rf /root/.cache/pip/* && \
221-
rm -rf /home/${USER}/.cache/pip/* && \
222-
apt-get clean && apt-get autoclean && apt-get autoremove -y
226+
&& rm -rf /tmp/downloaded_packages/ /tmp/*.rds \
227+
&& rm -rf /var/lib/apt/lists/* \
228+
&& rm -rf /root/.cache/pip/* \
229+
&& rm -rf /home/${USER}/.cache/pip/* \
230+
&& apt-get clean && apt-get autoclean && apt-get autoremove -y
223231

224232
## For Rattle:
225233
RUN wajig install -y libgtk2.0-dev && \
@@ -232,10 +240,6 @@ RUN wajig install -y libgtk2.0-dev && \
232240
RUN mkdir -p /usr/local/lib/R/site-library && \
233241
chown -R ${RSESSION_USER}:${RSESSION_USER} /usr/local/lib/R/site-library
234242

235-
RUN ln -s /usr/lib/R/site-library/littler/examples/install.r /usr/local/bin/install.r && \
236-
ln -s /usr/lib/R/site-library/littler/examples/install2.r /usr/local/bin/install2.r && \
237-
ln -s /usr/lib/R/site-library/littler/examples/installGithub.r /usr/local/bin/installGithub.r && \
238-
ln -s /usr/lib/R/site-library/littler/examples/testInstalled.r /usr/local/bin/testInstalled.r
239243

240244
# set cran repo
241245
RUN echo "options('repos' = 'https://cloud.r-project.org/')" >> /etc/R/Rprofile.site

Dockerfiles/rdsc_headless_j.dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ RUN install2.r --error --skipinstalled -n $NCPUS \
4444
future \
4545
# DQAstats:
4646
future.apply \
47+
ggside \
4748
ggplot2 \
4849
ggpubr \
4950
ggstatsplot \
@@ -79,7 +80,7 @@ RUN install2.r --error --skipinstalled -n $NCPUS \
7980
R.utils \
8081
R6 \
8182
rapportools \
82-
rattle \
83+
# rattle \
8384
rcmdcheck \
8485
RCurl \
8586
reactable \

build_rdsc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export DOCKER_BUILDKIT=1
1111
# docker buildx use mybuilder
1212

1313
## Should the docker building process build without caching? (true/false)
14-
docker_build_no_cache=true
14+
docker_build_no_cache=false
1515

1616
printf "\n\n##################################\n"
1717
printf "Building images with version tag $VERSION_TAG"

0 commit comments

Comments
 (0)