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.

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

New R and BioC versions #87

Merged
merged 2 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,29 +46,31 @@ on:
- "4.2.2"
- "4.3.0"
- "4.3.1"
- "4.3.2"
- "latest"
latest_r_version:
description: R Version to be used as latest
required: false
type: string
default: "4.3.1"
default: "4.3.2"
bioc_version:
description: BioConductor Release
required: true
type: choice
default: "3.17"
default: "3.18"
options:
- "3.13"
- "3.14"
- "3.15"
- "3.16"
- "3.17"
- "3.18"
- "devel"
latest_bioc_version:
description: BioC version to be used as latest
required: false
type: string
default: "3.17"
default: "3.18"
tag:
description: |
Custom Image Tag/Version. Defaults to current date in the `YYYY.MM.DD` format if unspecified.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:

steps:
- name: Checkout repo 🛎
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Lint Code Base 🧶
uses: github/super-linter/slim@v4
uses: github/super-linter/slim@v5
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: main
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/scheduled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:
strategy:
matrix:
image:
- distro_tag: '4.3.1'
bioc: '3.17'
- distro_tag: '4.3.2'
bioc: '3.18'
distro: rstudio-local
origin: rocker
- distro_tag: '4.3.1'
bioc: '3.17'
- distro_tag: '4.3.2'
bioc: '3.18'
distro: rstudio
origin: rocker
- distro_tag: 'latest'
Expand All @@ -61,18 +61,18 @@ jobs:
distro: fedora-gcc-devel
origin: rhub
- distro_tag: 'latest'
bioc: '3.17'
bioc: '3.18'
distro: debian-gcc-patched
origin: rhub
- distro_tag: 'latest'
bioc: '3.17'
bioc: '3.18'
distro: debian-gcc-release
origin: rhub

# Trigger steps
steps:
- name: Checkout repository 💳
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: main

Expand All @@ -87,8 +87,8 @@ jobs:
"distribution": "${{ matrix.image.distro }}",
"r_version": "${{ matrix.image.distro_tag }}",
"bioc_version": "${{ matrix.image.bioc }}",
"latest_r_version": "4.3.1",
"latest_bioc_version": "3.17",
"latest_r_version": "4.3.2",
"latest_bioc_version": "3.18",
"tag": "",
"tag_latest": "true",
"release_tag": "${{ needs.create-release.outputs.release_tag }}"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/security-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ jobs:
strategy:
matrix:
image:
- r: '4.3.1'
bioc: '3.17'
- r: '4.3.2'
bioc: '3.18'
distro: rstudio-local
steps:
- name: Log in to the Container registry 🗝
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Run Trivy vulnerability scanner 🚓
uses: aquasecurity/trivy-action@0.11.2
uses: aquasecurity/trivy-action@0.14.0
with:
scan-type: image
image-ref: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ matrix.image.distro }}_${{ matrix.image.r }}_bioc_${{ matrix.image.bioc }}:latest
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Build arguments
ARG ORIGIN=rocker
ARG ORIGIN_DISTRIBUTION=rstudio
ARG R_VERSION=4.3.1
ARG R_VERSION=4.3.2

# Fetch base image
FROM ${ORIGIN}/${ORIGIN_DISTRIBUTION}:${R_VERSION}

# Reset args in build context
ARG DISTRIBUTION=rstudio-local
ARG BIOC_VERSION=3.17
ARG BIOC_VERSION=3.18

# Set image metadata
LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
Expand Down