Skip to content

Commit

Permalink
Add changes from script
Browse files Browse the repository at this point in the history
  • Loading branch information
almahmoud committed Nov 14, 2023
1 parent 74cf741 commit 2582254
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 18 deletions.
37 changes: 25 additions & 12 deletions config/conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"tidyverse"
]
},
"version" : "2.2.3",
"version" : "2.2.4",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : true,
Expand Down Expand Up @@ -83,7 +83,9 @@
"tools" : [
"python"
],
"packages" : {},
"packages" : {

},
"version" : "1.1.3",
"automated_flags" : {
"generate_docs" : true,
Expand All @@ -99,8 +101,10 @@
"tools" : [
"r"
],
"packages" : {},
"version" : "2.2.3",
"packages" : {

},
"version" : "2.2.4",
"automated_flags" : {
"include_in_ui" : false,
"generate_docs" : true,
Expand All @@ -117,8 +121,10 @@
"python",
"r"
],
"packages" : {},
"version" : "2.3.4",
"packages" : {

},
"version" : "2.3.5",
"automated_flags" : {
"include_in_ui" : true,
"generate_docs" : true,
Expand All @@ -134,8 +140,10 @@
"python",
"r"
],
"packages" : {},
"version" : "2.2.7",
"packages" : {

},
"version" : "2.2.8",
"automated_flags" : {
"include_in_ui" : false,
"generate_docs" : false,
Expand All @@ -150,7 +158,9 @@
"tools" : [
"r"
],
"packages" : {},
"packages" : {

},
"version" : "0.1.1",
"automated_flags" : {
"include_in_ui" : false,
Expand All @@ -163,8 +173,11 @@
{
"name" : "wondershaper",
"base_label" : "wondershaper",
"tools" : [],
"packages" : {},
"tools" : [
],
"packages" : {

},
"version" : "0.0.1",
"automated_flags" : {
"include_in_ui" : false,
Expand All @@ -175,4 +188,4 @@
}
}
]
}
}
7 changes: 7 additions & 0 deletions terra-jupyter-aou/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.2.8 - 2023-11-14T15:56:44.507726350Z

- Update `terra-jupyter-r` to `1.1.4`
- Bioconductor 3.18 release

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.8`

## 2.2.7 - 2023-11-01
- Pin `gnomad` to `0.6.4`
- See https://github.com/broadinstitute/gnomad_methods/releases for details
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-aou/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.4
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.5

USER root

Expand Down
7 changes: 7 additions & 0 deletions terra-jupyter-bioconductor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.2.4 - 2023-11-14T15:56:44.470211534Z

- Update `terra-jupyter-r` to `1.1.4`
- Bioconductor 3.18 release

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.4`

## 2.2.3 - 2023-10-03
- Update `terra-jupyter-r` to `2.2.3`
- Update `terra-jupyter-base` to `1.1.3`
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-bioconductor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.3
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.4
7 changes: 7 additions & 0 deletions terra-jupyter-gatk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.3.5 - 2023-11-14T15:56:44.486168932Z

- Update `terra-jupyter-r` to `1.1.4`
- Bioconductor 3.18 release

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.5`

## 2.3.4 - 2023-10-06
- Update `terra-jupyter-python` to `1.1.4`
- Downgrade pytz to `2023.3`
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-gatk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.4 AS python

FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.3
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.4

USER root

Expand Down
6 changes: 6 additions & 0 deletions terra-jupyter-r/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 1.1.4 - 2023-11-14T15:56:44.443656567Z

- Bioconductor 3.18 release

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:1.1.4`

## 1.1.3 - 2023-10-03
- Update `terra-jupyter-base` to `1.1.3`
- Downgrade notebook to `6.5.4` and jupyterlab-server to `2.23.0`
Expand Down
6 changes: 3 additions & 3 deletions terra-jupyter-r/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ USER root
COPY scripts $JUPYTER_HOME/scripts

# Add env vars to identify binary package installation
ENV TERRA_R_PLATFORM="terra-jupyter-r-1.1.3"
ENV TERRA_R_PLATFORM_BINARY_VERSION=3.17
ENV TERRA_R_PLATFORM="terra-jupyter-r-1.1.4"
ENV TERRA_R_PLATFORM_BINARY_VERSION=3.18

# Install protobuf 3.20.3. Note this version comes from base deep learning image. Use `conda list` to see what's installed
RUN cd /tmp \
Expand Down Expand Up @@ -128,7 +128,7 @@ RUN pip3 -V \

RUN R -e 'install.packages("BiocManager")' \
## check version
&& R -e 'BiocManager::install(version="3.17", ask=FALSE)' \
&& R -e 'BiocManager::install(version="3.18", ask=FALSE)' \
&& R -e 'BiocManager::install(c( \
"boot", \
"class", \
Expand Down

0 comments on commit 2582254

Please sign in to comment.