Skip to content

Commit

Permalink
feat: updated to R 4.2.0 and RStudio 2022.0.2+485
Browse files Browse the repository at this point in the history
  • Loading branch information
joundso committed Apr 29, 2022
1 parent 2e419ee commit 8e7efa4
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
2 changes: 2 additions & 0 deletions Dockerfiles/rdsc_base_j.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ RUN if [ "$TARGETPLATFORM" = "$ARM_LABEL" ] ; \
apt-get clean && apt-get autoclean && apt-get autoremove -y; \
fi

ARG CACHEBREAKER=1

RUN apt-get update && apt-get install -y --no-install-recommends \
lmodern \
libapparmor1 \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/rdsc_rstudio_j.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ LABEL org.label-schema.schema-version="1.0" \

# get RStudio-Server (Preview Version): https://www.rstudio.com/products/rstudio/download/preview/
# ENV RSTUDIO_VERSION=1.4.1725 \
ENV RSTUDIO_VERSION=2022.02.1 \
RSTUDIO_VERSION_PREVIEW=461 \
ENV RSTUDIO_VERSION=2022.02.2 \
RSTUDIO_VERSION_PREVIEW=485 \
RSTUIO_URL=https://s3.amazonaws.com/rstudio-ide-build/server/bionic/amd64/
ENV RSTUDIO_FILE="rstudio-server-${RSTUDIO_VERSION}-${RSTUDIO_VERSION_PREVIEW}-amd64.deb"
ENV RSTUDIO_LINK=${RSTUIO_URL}${RSTUDIO_FILE}
Expand Down
15 changes: 13 additions & 2 deletions build_rdsc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,19 @@ export DOCKER_BUILDKIT=1
# docker buildx create --name mybuilder
# docker buildx use mybuilder

## Should the docker building process build without caching? (true/false)
docker_build_no_cache=false
## Should the docker building process build using caching? (true/false)
docker_build_with_cache=true

## -------------------------------------------
## Starting the actual script:
## -------------------------------------------

if [ "$docker_build_with_cache" = true ]
then
docker_build_no_cache=false
else
docker_build_no_cache=true
fi

printf "\n\n##################################\n"
printf "Building images with version tag $VERSION_TAG"
Expand Down

0 comments on commit 8e7efa4

Please sign in to comment.