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

[IA-4586] Regenerate images with known versions of jupyter notebook and server #461

Merged
merged 1 commit into from
Oct 5, 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
14 changes: 7 additions & 7 deletions config/conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"tidyverse"
]
},
"version" : "2.2.2",
"version" : "2.2.3",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : true,
Expand All @@ -47,7 +47,7 @@
"hail"
]
},
"version" : "1.1.2",
"version" : "1.1.3",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : true,
Expand All @@ -68,7 +68,7 @@
"scikit-learn"
]
},
"version" : "1.1.2",
"version" : "1.1.3",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : true,
Expand All @@ -86,7 +86,7 @@
"packages" : {

},
"version" : "1.1.2",
"version" : "1.1.3",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : false,
Expand All @@ -104,7 +104,7 @@
"packages" : {

},
"version" : "2.2.2",
"version" : "2.2.3",
"automated_flags" : {
"include_in_ui" : false,
"generate_docs" : true,
Expand All @@ -124,7 +124,7 @@
"packages" : {

},
"version" : "2.3.2",
"version" : "2.3.3",
"automated_flags" : {
"include_in_ui" : true,
"generate_docs" : true,
Expand All @@ -143,7 +143,7 @@
"packages" : {

},
"version" : "2.2.2",
"version" : "2.2.3",
"automated_flags" : {
"include_in_ui" : false,
"generate_docs" : false,
Expand Down
8 changes: 8 additions & 0 deletions terra-jupyter-aou/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 2.2.3 - 2023-10-03
- Update `terra-jupyter-gatk` to `2.3.3`
- Update `terra-jupyter-python` to `1.1.3`
- Update `terra-jupyter-base` to `1.1.3`
- Downgrade notebook to `6.5.4` and jupyterlab-server to `2.23.0`

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

## 2.2.2 - 2023-07-31
- Update `terra-jupyter-gatk` to `2.3.2`
- Update `terra-jupyter-python` to `1.1.2`
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.2
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.3

USER root

Expand Down
5 changes: 5 additions & 0 deletions terra-jupyter-base/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.1.3 - 2023-10-03
- Downgrade notebook to `6.5.4` and jupyterlab-server to `2.23.0`

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.3`

## 1.1.2 - 2023-07-31
- Upgrade Terra Notebook Utils to `0.13.0`

Expand Down
3 changes: 3 additions & 0 deletions terra-jupyter-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ RUN pip3 -V \
# Avoid notebook extension issues
&& pip3 install "nbclassic<0.5" \
# for jupyter_delocalize.py and jupyter_notebook_config.py
# DO NOT CHANGE OR UNPIN NOTEBOOK OR JUPYTERLAB-SERVER! When trying with 6.5.5 and 2.24.0 notebook commands could not find the notebook config file
&& pip3 install notebook==6.5.4 \
&& pip3 install jupyterlab-server==2.23.0 \
&& pip3 install requests \
&& pip3 install firecloud \
&& pip3 install terra-notebook-utils==0.13.0 \
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.3 - 2023-10-03
- Update `terra-jupyter-r` to `2.2.3`
- Update `terra-jupyter-base` to `1.1.3`
- Downgrade notebook to `6.5.4` and jupyterlab-server to `2.23.0`

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

## 2.2.2 - 2023-07-31
- Update `terra-jupyter-r` to `2.2.2`
- Update `terra-jupyter-base` to `1.1.2`
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.2
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.3
8 changes: 8 additions & 0 deletions terra-jupyter-gatk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 2.3.3 - 2023-10-03
- Update `terra-jupyter-r` to `2.2.3`
- Update `terra-jupyter-python` to `1.1.3`
- Update `terra-jupyter-base` to `1.1.3`
- Downgrade notebook to `6.5.4` and jupyterlab-server to `2.23.0`

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

## 2.3.2 - 2023-07-31
- Update `terra-jupyter-python` to `1.1.2`
- Update `terra-jupyter-base` tp `1.1.2`
Expand Down
4 changes: 2 additions & 2 deletions 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.2 AS python
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.3 AS python

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

USER root

Expand Down
7 changes: 7 additions & 0 deletions terra-jupyter-hail/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.1.3 - 2023-10-03
- Update `terra-jupyter-python` to `1.1.3`
- Update `terra-jupyter-base` to `1.1.3`
- Downgrade notebook to `6.5.4` and jupyterlab-server to `2.23.0`

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-hail:1.1.3`

## 1.1.2 - 2023-07-31
- Update `terra-jupyter-python` to `1.1.2`
- Update `terra-jupyter-base` to `1.1.2`
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-hail/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-python:1.1.2
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.3

USER root

Expand Down
6 changes: 6 additions & 0 deletions terra-jupyter-python/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 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`

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.3`

## 1.1.2 - 2023-07-31
- Update `terra-jupyter-base` to `1.1.2`
- Upgrade Terra Notebook Utils to `0.13.0`
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-python/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-base:1.1.2
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.3

USER root
# This makes it so pip runs as root, not the user.
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.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`

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

## 2.2.2 - 2023-07-31
- Update `terra-jupyter-base` to `1.1.2`
- Upgrade Terra Notebook Utils to `0.13.0`
Expand Down
4 changes: 2 additions & 2 deletions terra-jupyter-r/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.2
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.3

USER root

COPY scripts $JUPYTER_HOME/scripts

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

# Install protobuf 3.20.3. Note this version comes from base deep learning image. Use `conda list` to see what's installed
Expand Down