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

Added 'datashield/armadillo-rserver_caravan' and 'datashield/armadillo-rserver_caravan-volcano' #28

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
cd21821
Initial 'armadillo-rserver_caravan' spec
StuartWheater Sep 30, 2022
1c6b7e5
Move to using 'armadillo-rserver_caravan' image
StuartWheater Sep 30, 2022
710de74
Initial spec of 'armadillo-rserver_caravan-volcano'
StuartWheater Sep 30, 2022
4d0a2d9
Merge branch 'datashield:main' into main
StuartWheater Sep 30, 2022
f932938
Removed duplicate commands
StuartWheater Sep 30, 2022
847991e
Removed duplicate commands
StuartWheater Sep 30, 2022
f8fe47e
Merge branch 'main' of github.com:StuartWheater/docker-armadillo-rser…
StuartWheater Sep 30, 2022
2376e8a
Updated to 'resources' 1.3.0
StuartWheater Oct 7, 2022
4028641
Updated to base 'armadillo-rserver_caravan' 1.1.0
StuartWheater Oct 7, 2022
17869a7
Added 'armadillo-rserver_edam', 'armadillo-rserver_caravan-stadium' a…
StuartWheater Oct 21, 2022
6bfc792
Added MolgenisRserve R package
StuartWheater Nov 1, 2022
9ed570c
Switched back R 4.1.3 and arrow 8.0.0
StuartWheater Dec 12, 2022
e6ec0ef
Update package versions
StuartWheater Jan 20, 2023
37ae581
Updated to 'datashield/armadillo-rserver_caravan:1.0.1'
StuartWheater Feb 13, 2023
346e580
Updated to 'datashield/armadillo-rserver_caravan:1.0.1', fixed
StuartWheater Feb 13, 2023
f426162
Initia; 'wasp' profile
StuartWheater Mar 1, 2023
440d4f8
Initail 'armadillo-rserver_caravan-xenon'
StuartWheater Apr 3, 2023
66f7767
Update dsMLTBase
StuartWheater Apr 4, 2023
be94781
Initial version of 'armadillo-rserver_caravan-yak'
StuartWheater Apr 5, 2023
d025a2d
Merge branch 'datashield:main' into main
StuartWheater May 1, 2023
1c51ac8
Update for 'edam', 'edam-tarrain' and 'caravan-stadium'
StuartWheater May 1, 2023
4855d7f
Added 'habitat' and 'habitat-zenith'
StuartWheater May 1, 2023
1254412
Updates to images
StuartWheater May 22, 2023
26d6061
Added LABELs
StuartWheater May 22, 2023
c9f088f
Added LABELs
StuartWheater May 22, 2023
ed8e855
Reflect update in BiocManager version to 1.30.20
StuartWheater May 23, 2023
2c6147c
Updated to use Rserve directly
StuartWheater May 23, 2023
f3e3203
Using new 'caraven:1.1.1'
StuartWheater May 23, 2023
8993c58
Initial 'iconic' and 'iconic-aqueduct'
StuartWheater Jul 24, 2023
9ce8bd6
ionic-babel - permissive dsBase
StuartWheater Nov 20, 2023
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
5 changes: 5 additions & 0 deletions development/armadillo-rserver_caravan-stadium/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## [1.0.0](https://github.com/datashield/docker-armadillo-rserver-base/compare/@datashield/armadillo-rserver-dev-v2.0.0...@datashield/armadillo-rserver-dev-v2.0.1) (2021-09-13)

### Features

# Initial version
38 changes: 38 additions & 0 deletions development/armadillo-rserver_caravan-stadium/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM datashield/armadillo-rserver_caravan:1.1.0

# Update package metdata
RUN apt-get update -y

# Install OS dependencies
RUN apt-get install liblzma-dev libicu-dev -y

# Install dsBase development package
ENV DSBASE_BRANCH "6.2.0"
RUN installGithub.r "datashield/dsBase@${DSBASE_BRANCH}" --deps TRUE

# Install dsMediation development package
ENV DSMEDIATION_BRANCH "0.0.3"
RUN installGithub.r "datashield/dsMediation@${DSMEDIATION_BRANCH}" --deps TRUE

# Install BioConductor package
RUN installBioc.r 'Biobase'
RUN installBioc.r 'SNPRelate'
RUN installBioc.r 'GENESIS'
RUN installBioc.r 'GWASTools'
RUN installBioc.r 'GenomicRanges'
RUN installBioc.r 'SummaredExperiment'
RUN installBioc.r 'MEAL'
RUN installBioc.r 'DESeq2'
RUN installBioc.r 'edgeR'
RUN installBioc.r 'rexposome'

# Install dsExposome development package
ENV DSEXPOSOME_BRANCH "2.0.4"
RUN installGithub.r "isglobal-brge/dsExposome@${DSEXPOSOME_BRANCH}" --deps TRUE

# Install dsSurvival development package
ENV DSSURVIVAL_BRANCH "v2.1.0"
RUN installGithub.r "neelsoumya/dsSurvival@${DSSURVIVAL_BRANCH}" --deps TRUE

# Setup entry point to MolgenisRServer::Rserve
CMD R -e "MolgenisRserve::Rserve(debug=${DEBUG}, args='--vanilla --RS-set remote=enable --RS-set auth=disable --RS-set daemon=disable')"
42 changes: 42 additions & 0 deletions development/armadillo-rserver_caravan-stadium/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# DataSHIELD R server - development environment
The DataSHIELD RServer has installed collections of tools to support DataSHIELD analysis. The package installed is the cutting edge development package.

The purpose of the docker image generate by this configuration is intended to support the LifeCycle Project.

## Contents
There are several DataSHIELD related dependencies installed

This DataSHIELD Packages included are:
- [dsBase](https://github.com/datashield/dsBase/tree/6.2.0) 6.2.0
- [dsMediation](https://github.com/datashield/dsMediation/tree/0.0.3) 0.0.3
- [dsExposome](https://github.com/isglobal-brge/dsExposome/tree/2.0.4) 2.0.4
- [dsSurvival](https://github.com/neelsoumya/dsSurvival/tree/v1.0.1) v2.1.0

## Usage
There are several platforms on which you can run RServer.

### Deploy locally
You can steer the rserver at runtime using environment variables. You can toggle debug mode with the environment variable `DEBUG`.

Run the docker locally (docker only):

`docker run -e DEBUG=TRUE datashield/docker-armadillo-rserver-base/development/armadillo-rserver_caravan-stadium:1.1.0`

Run in docker-compose `docker-compose.yml`:

```yaml
...
services:
armadillo-rserver-dev:
environment:
- DEBUG = TRUE
...
```

### Deploy using Ansible

Check: https://galaxy.ansible.com/molgenis/armadillo

### Deploy using Kubernetes and helm

Check: https://github.com/molgenis/molgenis-ops-helm/tree/master/charts/molgenis-armadillo
Loading