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

[ID-1352] Update TNU version in Dockerfile #495

Merged
merged 21 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

We do our work on a feature branch based on master. When you open a pull request, add the JIRA issue number to the PR title. This will make a reference from JIRA to the GitHub issue. Briefly describe your changes in the description section.

This is also a good opportunity to verify that all the appropriate image versions were bumped. It is important to keep in mind which images extend from where ([Image Dependecies](https://github.com/DataBiosphere/terra-docker#image-dependencies)). Make sure to bump the version of the image you are changing and update its reference in all images that extend from it.
This is also a good opportunity to verify that all the appropriate image versions were bumped. It is important to keep in mind which images extend from where ([Image Dependecies](https://github.com/DataBiosphere/terra-docker#image-dependencies)). Make sure to bump the version of the image you are changing in `config/conf.json` and update its reference in all images that extend from it.

You can also run `amm ./updateVersions.sc <image name> <release note>` to upgrade derived images. If you're updating `terra-jupyter-aou` image, please make a pull request similar to [this PR](https://github.com/DataBiosphere/leonardo/pull/1612) (less updating `terra_jupyter_aou_old`).

Expand Down
26 changes: 13 additions & 13 deletions config/conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"tidyverse"
]
},
"version" : "2.2.5",
"version" : "2.2.6",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : true,
Expand All @@ -47,7 +47,7 @@
"hail"
]
},
"version" : "1.1.12",
"version" : "1.1.13",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : true,
Expand All @@ -68,7 +68,7 @@
"scikit-learn"
]
},
"version" : "1.1.5",
"version" : "1.1.6",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : true,
Expand All @@ -84,9 +84,9 @@
"python"
],
"packages" : {

},
"version" : "1.1.3",
"version" : "1.1.4",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : false,
Expand All @@ -102,9 +102,9 @@
"r"
],
"packages" : {

},
"version" : "2.2.5",
"version" : "2.2.6",
"automated_flags" : {
"include_in_ui" : false,
"generate_docs" : true,
Expand All @@ -122,9 +122,9 @@
"r"
],
"packages" : {

},
"version" : "2.3.7",
"version" : "2.3.8",
"automated_flags" : {
"include_in_ui" : true,
"generate_docs" : true,
Expand All @@ -141,9 +141,9 @@
"r"
],
"packages" : {

},
"version" : "2.2.13",
"version" : "2.2.14",
"automated_flags" : {
"include_in_ui" : false,
"generate_docs" : false,
Expand All @@ -159,7 +159,7 @@
"r"
],
"packages" : {

},
"version" : "0.1.1",
"automated_flags" : {
Expand All @@ -176,7 +176,7 @@
"tools" : [
],
"packages" : {

},
"version" : "0.0.1",
"automated_flags" : {
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.14 - 2024-09-04
- Update `terra-jupyter-gatk` to `2.3.8`
- Update `terra-jupyter-python` to `1.1.6`
- Update `terra-jupyter-base` to `1.1.4`
- Update terra-notebook-utils to `0.14.0`

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

## 2.2.13 - 2024-08-12
- Update `hail` to `0.2.130.post1`
- See https://github.com/hail-is/hail/releases/tag/0.2.130.post1 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.7
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.8

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.4 - 2024-09-04
- Update terra-notebook-utils to `0.14.0`

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

## 1.1.3 - 2023-10-03
- Downgrade notebook to `6.5.4` and jupyterlab-server to `2.23.0`

Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ RUN pip3 -V \
&& pip3 install jupyterlab-server==2.23.0 \
&& pip3 install requests \
&& pip3 install firecloud \
&& pip3 install terra-notebook-utils==0.13.0 \
&& pip3 install terra-notebook-utils==0.14.0 \
&& pip3 install crcmod \
# For gcloud alpha storage support.
&& pip3 install google-crc32c --target /usr/lib/google-cloud-sdk/lib/third_party \
Expand Down
8 changes: 8 additions & 0 deletions terra-jupyter-bioconductor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 2.2.6 - 2024-09-04

- Update `terra-jupyter-r` to `2.2.6`
- Update `terra-jupyter-base` to `1.1.4`
- Update terra-notebook-utils to `0.14.0`

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

## 2.2.5 - 2024-05-15T15:36:28.576892790Z

- Update `terra-jupyter-r` to `2.2.5`
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.5
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.6
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.8 - 2024-09-04
- Update `terra-jupyter-python` to `1.1.6`
- Update `terra-jupyter-base` to `1.1.4`
- Update terra-notebook-utils to `0.14.0`

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

## 2.3.7 - 2024-05-15T15:36:28.602743427Z

- Update `terra-jupyter-r` to `2.2.5`
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-gatk/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.5 AS python
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.6 AS python

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

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.13 - 2024-09-04
- Update `terra-jupyter-python` to `1.1.6`
- Update `terra-jupyter-base` to `1.1.4`
- Update terra-notebook-utils to `0.14.0`

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

## 1.1.12 - 2024-08-12
- Update `hail` to `0.2.130.post1`
- See https://github.com/hail-is/hail/releases/tag/0.2.130.post1 for details
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.5
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.6

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.6 - 2024-09-04
- Update `terra-jupyter-base` to `1.1.4`
- Update terra-notebook-utils to `0.14.0`

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

## 1.1.5 - 2023-11-28
- Pin bleach to `6.0.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.3
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.4

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 @@
## 2.2.6 - 2024-09-04
- Update `terra-jupyter-base` to `1.1.4`
- Update terra-notebook-utils to `0.14.0`

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

## 2.2.5 - 2024-05-15T15:36:28.555690376Z

- Update for R 4.4.0 and Bioc 3.19
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-r/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.3
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.4

USER root

Expand Down
Loading