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.

Sign up for GitHub

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

Bump images, add helper script #2880

Merged
merged 1 commit into from
Sep 20, 2022
Merged

Bump images, add helper script #2880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 docker/registry/go/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=golang:1
deephaven.registry.imageId=golang@sha256:d3f734e1f46ec36da8c1bce67cd48536138085289e24cfc8765f483c401b7d96
deephaven.registry.imageId=golang@sha256:2d17ffd12a2cdb25d4a633ad25f8dc29608ed84f31b3b983427d825280427095
2 changes: 1 addition & 1 deletion docker/registry/nginx-base/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=ghcr.io/deephaven/nginx-base:latest
deephaven.registry.imageId=ghcr.io/deephaven/nginx-base@sha256:4833e381165ec4fe0f84114db34aa0ca5321663fe0a3aef3d35484dc5a793f18
deephaven.registry.imageId=ghcr.io/deephaven/nginx-base@sha256:59e01d102c0137cd947583ad6add1a56629e7a2de26a2071745a3190bdf7b3be
2 changes: 1 addition & 1 deletion docker/registry/nltk-base/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=ghcr.io/deephaven/nltk-base:latest
deephaven.registry.imageId=ghcr.io/deephaven/nltk-base@sha256:262be75b8ca9a0f4b6f8e0c2474c449dcfb6c8a5d81f1f5995d5e38628da64ae
deephaven.registry.imageId=ghcr.io/deephaven/nltk-base@sha256:87138dec8f42ba200a711b7aa150ee9f7c8f0def8371c7aa28787f852b2304cb
2 changes: 1 addition & 1 deletion docker/registry/node/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=node:14
deephaven.registry.imageId=node@sha256:48ad857f33fb03f542133b1e0d3524b1fcf596fce29e212cd9b7abd22d3d9188
deephaven.registry.imageId=node@sha256:6adfb0c2a9db12a06893974bb140493a7482e2b3df59c058590594ceecd0c99b
2 changes: 1 addition & 1 deletion docker/registry/protoc-base/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=ghcr.io/deephaven/protoc-base:latest
deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:c9cb597c2cd784da48d3cdf08065ce1bb00d1f079b1fee68aeadaa14c4259d0c
deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:228b372ed0e528657f4a6b805d2c30e1db788936536b11816592699dff883a9c
2 changes: 1 addition & 1 deletion docker/registry/python/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=python:3.7
deephaven.registry.imageId=python@sha256:8b743b1af852e554b98e2377f9c92221693225b85d984b23be6b033018f97cc3
deephaven.registry.imageId=python@sha256:2341ac5eedd71f1e6481afe854af572f5ec1b78fa3aea2293dba65942108e663
2 changes: 1 addition & 1 deletion docker/registry/pytorch-base/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=ghcr.io/deephaven/pytorch-base:latest
deephaven.registry.imageId=ghcr.io/deephaven/pytorch-base@sha256:9fd68c695baea12be44c65cb5da0a85cd92e3e4bb9c904c35d4433eaac16aa61
deephaven.registry.imageId=ghcr.io/deephaven/pytorch-base@sha256:58d386abae8e65c1a5e04987992683b430f72a6699bb320f1bd81b2170b217b3
29 changes: 29 additions & 0 deletions docker/registry/scripts/update-requirements.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/usr/bin/env bash
set -o errexit
set -o pipefail
set -o nounset
set -o xtrace

# This script is a helper utility to automate the process of bumping the base images and updated the requirements.

__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
__gradlew="${__dir}/../../../gradlew"

# Pull and update the registry images
"${__gradlew}" pullImage bumpImage --continue

# Get the (potentially) new IDs
server_base_image_id="$(${__gradlew} -q docker-server-base:showImageId)"
nltk_base_image_id="$(${__gradlew} -q docker-nltk-base:showImageId)"
pytorch_base_image_id="$(${__gradlew} -q docker-pytorch-base:showImageId)"
sklearn_base_image_id="$(${__gradlew} -q docker-sklearn-base:showImageId)"
tensorflow_base_image_id="$(${__gradlew} -q docker-tensorflow-base:showImageId)"

# Write down the (potentially) new requirements
# Need to manually remove pkg-resources
# https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1635463
docker run --rm "${server_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server/requirements.txt"
docker run --rm "${nltk_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-nltk/requirements.txt"
docker run --rm "${pytorch_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-pytorch/requirements.txt"
docker run --rm "${sklearn_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-sklearn/requirements.txt"
docker run --rm "${tensorflow_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-tensorflow/requirements.txt"
2 changes: 1 addition & 1 deletion docker/registry/server-base/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=ghcr.io/deephaven/server-base:latest
deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:472187971da83046cdee278d1b167077e2af2a9b15ba2eff5c69670ac533f0cf
deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:014c9f24f95c16fc06b67fd376c6eba9a6d62264642929a8be63e55e61822ae9
2 changes: 1 addition & 1 deletion docker/registry/sklearn-base/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=ghcr.io/deephaven/sklearn-base:latest
deephaven.registry.imageId=ghcr.io/deephaven/sklearn-base@sha256:18ca26c4577ce9267f92b244a7f7ab60a58ab4226f9bef2ee8ab9593340d008c
deephaven.registry.imageId=ghcr.io/deephaven/sklearn-base@sha256:d679d732f1e341629defec041646ab07859a178eb1cf9715191a366e36bf1d23
2 changes: 1 addition & 1 deletion docker/registry/slim-base/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=ghcr.io/deephaven/slim-base:latest
deephaven.registry.imageId=ghcr.io/deephaven/slim-base@sha256:cd087ae1e4415f218d4856dd8f0a101da5919a8c001a432dad318fd30be4e5ee
deephaven.registry.imageId=ghcr.io/deephaven/slim-base@sha256:c7aa71e7c9c22583e6a61592fa403d87190d987ef6a14f4f591455281c0b8ee0
2 changes: 1 addition & 1 deletion docker/registry/tensorflow-base/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=ghcr.io/deephaven/tensorflow-base:latest
deephaven.registry.imageId=ghcr.io/deephaven/tensorflow-base@sha256:06c28c717ca9686c36be82625afca660aefb70b3223496daf31e55bca51a93ac
deephaven.registry.imageId=ghcr.io/deephaven/tensorflow-base@sha256:4e2d9a4803a9f910bd4478ef7f977e7dd8cbd1b86f53fcde2b9d5aab8184b9e1
10 changes: 5 additions & 5 deletions docker/server/src/main/server-nltk/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
click==8.1.3
deephaven-plugin==0.2.0
importlib-metadata==4.12.0
joblib==1.1.0
joblib==1.2.0
jpy==0.11.0
llvmlite==0.39.0
llvmlite==0.39.1
nltk==3.6.7
numba==0.56.0
numba==0.56.2
numpy==1.21.6
pandas==1.3.5
python-dateutil==2.8.2
pytz==2022.2.1
regex==2022.8.17
regex==2022.9.13
six==1.16.0
tqdm==4.64.0
tqdm==4.64.1
typing_extensions==4.3.0
zipp==3.8.1
16 changes: 8 additions & 8 deletions docker/server/src/main/server-pytorch/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
absl-py==1.2.0
cachetools==5.2.0
certifi==2022.6.15
certifi==2022.9.14
charset-normalizer==2.1.1
deephaven-plugin==0.2.0
google-auth==2.11.0
google-auth==2.11.1
google-auth-oauthlib==0.4.6
grpcio==1.47.0
idna==3.3
grpcio==1.48.1
idna==3.4
importlib-metadata==4.12.0
jpy==0.11.0
llvmlite==0.39.0
llvmlite==0.39.1
Markdown==3.4.1
MarkupSafe==2.1.1
numba==0.56.0
numba==0.56.2
numpy==1.21.6
oauthlib==3.2.0
oauthlib==3.2.1
pandas==1.3.5
protobuf==3.19.4
protobuf==3.19.5
pyasn1==0.4.8
pyasn1-modules==0.2.8
python-dateutil==2.8.2
Expand Down
6 changes: 3 additions & 3 deletions docker/server/src/main/server-sklearn/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
deephaven-plugin==0.2.0
importlib-metadata==4.12.0
joblib==1.1.0
joblib==1.2.0
jpy==0.11.0
llvmlite==0.39.0
numba==0.56.0
llvmlite==0.39.1
numba==0.56.2
numpy==1.21.6
pandas==1.3.5
python-dateutil==2.8.2
Expand Down
24 changes: 12 additions & 12 deletions docker/server/src/main/server-tensorflow/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
absl-py==1.2.0
astunparse==1.6.3
cachetools==5.2.0
certifi==2022.6.15
certifi==2022.9.14
charset-normalizer==2.1.1
deephaven-plugin==0.2.0
flatbuffers==2.0
flatbuffers==2.0.7
gast==0.4.0
google-auth==2.11.0
google-auth==2.11.1
google-auth-oauthlib==0.4.6
google-pasta==0.2.0
grpcio==1.47.0
grpcio==1.48.1
h5py==3.7.0
idna==3.3
idna==3.4
importlib-metadata==4.12.0
jpy==0.11.0
keras==2.7.0
Keras-Preprocessing==1.1.2
libclang==14.0.6
llvmlite==0.39.0
llvmlite==0.39.1
Markdown==3.4.1
MarkupSafe==2.1.1
numba==0.56.0
numba==0.56.2
numpy==1.21.6
oauthlib==3.2.0
oauthlib==3.2.1
opt-einsum==3.3.0
pandas==1.3.5
protobuf==3.19.4
protobuf==3.19.5
pyasn1==0.4.8
pyasn1-modules==0.2.8
python-dateutil==2.8.2
Expand All @@ -37,10 +37,10 @@ six==1.16.0
tensorboard==2.10.0
tensorboard-data-server==0.6.1
tensorboard-plugin-wit==1.8.1
tensorflow==2.7.3
tensorflow==2.7.4
tensorflow-estimator==2.7.0
tensorflow-io-gcs-filesystem==0.26.0
termcolor==1.1.0
tensorflow-io-gcs-filesystem==0.27.0
termcolor==2.0.1
typing_extensions==4.3.0
urllib3==1.26.12
Werkzeug==2.2.2
Expand Down
4 changes: 2 additions & 2 deletions docker/server/src/main/server/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
deephaven-plugin==0.2.0
importlib-metadata==4.12.0
jpy==0.11.0
llvmlite==0.39.0
numba==0.56.0
llvmlite==0.39.1
numba==0.56.2
numpy==1.21.6
pandas==1.3.5
python-dateutil==2.8.2
Expand Down