From 6229748665ef97115faf48b668d2d0cd9ce126a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= <roskarr@ethz.ch>
Date: Thu, 15 Oct 2020 01:47:15 +0200
Subject: [PATCH 1/2] fix: pin RStudio version

closes #124
---
 .../workflows/build_and_push_to_docker.yml    | 42 -------------------
 docker/r/Dockerfile                           |  4 ++
 2 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/build_and_push_to_docker.yml b/.github/workflows/build_and_push_to_docker.yml
index 099f3211..8aa442c5 100644
--- a/.github/workflows/build_and_push_to_docker.yml
+++ b/.github/workflows/build_and_push_to_docker.yml
@@ -8,8 +8,6 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: true
     steps:
     - name: Docker Login
       uses: Azure/docker-login@v1
@@ -67,45 +65,6 @@ jobs:
         EXTENSION: ${{ matrix.EXTENSIONS }}
         DOCKER_NAME: "renku/renkulab"
 
-  build-r:
-    needs: build-py
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: true
-      matrix:
-        RVERSIONS:
-          - 3.5.2
-          - 3.6.0
-          - 3.6.1
-    steps:
-    - name: Docker Login
-      uses: Azure/docker-login@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - uses: actions/checkout@v2
-    - name: Build renku project rocker docker images
-      run: |
-        if [[ ${{ github.ref }} == refs/tags* ]]; then
-          export LABEL=$(echo ${{ github.ref }} | cut -d / -f 3)
-        else
-          export LABEL=$(echo ${{ github.sha }} | cut -c 1-7)
-        fi
-
-        export DOCKER_TAG="$RVERSION-$LABEL"
-        docker build docker/r \
-          --build-arg RENKU_BASE="$DOCKER_NAME-py:3.7-$LABEL" \
-          --build-arg BASE_IMAGE="rocker/verse:${RVERSION}" \
-          --tag $DOCKER_NAME-r:$DOCKER_TAG
-        docker push $DOCKER_NAME-r:$DOCKER_TAG
-
-      env:
-        DOCKER_NAME: "renku/renkulab"
-        # selected R versions available for rocker/rstudio
-        RVERSION: ${{ matrix.RVERSIONS }}
-
   build-r-ubuntu:
     needs: build-py
     runs-on: ubuntu-latest
@@ -114,7 +73,6 @@ jobs:
       fail-fast: true
       matrix:
         RVERSIONS:
-          - 3.6.3
           - 4.0.0
     steps:
     - name: Docker Login
diff --git a/docker/r/Dockerfile b/docker/r/Dockerfile
index 9ab8fda7..d125a44d 100644
--- a/docker/r/Dockerfile
+++ b/docker/r/Dockerfile
@@ -28,6 +28,10 @@ RUN echo "PATH=${PATH}" >> /usr/local/lib/R/etc/Renviron && \
 # without this being explicitly set
 ENV LD_LIBRARY_PATH /usr/local/lib/R/lib
 
+# pin the version of RStudio
+ENV RSTUDIO_VERSION 1.2.5042
+RUN /rocker_scripts/install_rstudio.sh
+
 # Add Tini
 ENV TINI_VERSION v0.18.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini

From 3afe2cc00bf870b86dac71eb4fe6e4b52e59d56e Mon Sep 17 00:00:00 2001
From: Rok Roskar <rok.roskar@sdsc.ethz.ch>
Date: Thu, 15 Oct 2020 11:10:30 +0200
Subject: [PATCH 2/2] build: only use bioc 3.11 and devel

---
 .github/workflows/build_and_push_to_docker.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build_and_push_to_docker.yml b/.github/workflows/build_and_push_to_docker.yml
index 8aa442c5..c45bfa00 100644
--- a/.github/workflows/build_and_push_to_docker.yml
+++ b/.github/workflows/build_and_push_to_docker.yml
@@ -111,7 +111,6 @@ jobs:
       matrix:
         RELEASES:
           - devel
-          - RELEASE_3_10
           - RELEASE_3_11
     steps:
     - name: Docker Login