Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: pin RStudio version #125

Merged
merged 2 commits into from
Oct 15, 2020
Merged

fix: pin RStudio version #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6229748
fix: pin RStudio version
rokroskar Oct 14, 2020
3afe2cc
build: only use bioc 3.11 and devel
rokroskar Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions .github/workflows/build_and_push_to_docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ jobs:

runs-on: ubuntu-latest

strategy:
fail-fast: true
steps:
- name: Docker Login
uses: Azure/docker-login@v1
Expand Down Expand Up @@ -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
Expand All @@ -114,7 +73,6 @@ jobs:
fail-fast: true
matrix:
RVERSIONS:
- 3.6.3
- 4.0.0
steps:
- name: Docker Login
Expand Down Expand Up @@ -153,7 +111,6 @@ jobs:
matrix:
RELEASES:
- devel
- RELEASE_3_10
- RELEASE_3_11
steps:
- name: Docker Login
Expand Down
4 changes: 4 additions & 0 deletions docker/r/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down