-
Notifications
You must be signed in to change notification settings - Fork 80
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
Extract deephaven/runtime-base #1557
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pip==21.3.1 | ||
setuptools==59.0.1 | ||
wheel==0.37.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
plugins { | ||
id 'com.bmuschko.docker-remote-api' | ||
} | ||
|
||
evaluationDependsOn ':docker-java-and-python' | ||
evaluationDependsOn ':deephaven-jpy' | ||
evaluationDependsOn ':deephaven-wheel' | ||
evaluationDependsOn ':deephaven2-wheel' | ||
|
||
def dockerContext = project.layout.buildDirectory.dir('context') | ||
|
||
def prepareDocker = project.tasks.register('prepareDocker', Sync) { | ||
// deephaven-jpy.whl | ||
def deephavenJpyWheel = project(':deephaven-jpy').tasks.getByName('buildWheel') | ||
|
||
// deephaven.whl | ||
def deephavenWheel = project(':deephaven-wheel').tasks.getByName('buildWheel') | ||
|
||
// deephaven2.whl | ||
def deephaven2Wheel = project(':deephaven2-wheel').tasks.getByName('buildWheel') | ||
|
||
from (deephavenJpyWheel.outputs.files) { | ||
into 'deephaven-jpy-wheel' | ||
} | ||
from (deephavenWheel.outputs.files) { | ||
into 'deephaven-wheel' | ||
} | ||
from (deephaven2Wheel.outputs.files) { | ||
into 'deephaven2-wheel' | ||
} | ||
|
||
from 'src/main/docker' | ||
into dockerContext | ||
} | ||
|
||
Docker.registerDockerImage(project, 'buildDocker') { | ||
// deephaven/java-and-python:local-build | ||
def javaAndPython = project(':docker-java-and-python').tasks.getByName('buildDocker') | ||
|
||
dependsOn prepareDocker | ||
|
||
inputs.files javaAndPython.outputs.files | ||
|
||
inputDir.set dockerContext | ||
|
||
images.add('deephaven/runtime-base:local-build') | ||
} | ||
|
||
assemble.dependsOn buildDocker |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
FROM deephaven/java-and-python:local-build as install-wheels | ||
|
||
RUN set -eux; \ | ||
apt-get -qq update; \ | ||
apt-get -qq -y --no-install-recommends install liblzo2-2 curl; \ | ||
rm -rf /var/lib/apt/lists/* | ||
|
||
# To update the requirements.txt: | ||
# 1. Comment out BLOCK 1 | ||
# 2. Remove the --no-index arguments from the RUNs | ||
# 3. Run `./gradlew docker-runtime-base:build` | ||
# 4. Run `docker run --rm -it deephaven/runtime-base:local-build pip freeze | grep -v " @ file" > docker/runtime-base/src/main/docker/requirements.txt` | ||
# 5. Replace the --no-index arguments from the RUNs | ||
# 6. Uncomment BLOCK 1 | ||
|
||
# START BLOCK 1 | ||
COPY requirements.txt requirements.txt | ||
RUN set -eux; \ | ||
python3 -m pip install --no-cache-dir -r requirements.txt; \ | ||
rm requirements.txt | ||
# END BLOCK 1 | ||
|
||
COPY deephaven-jpy-wheel/ /deephaven-jpy-wheel | ||
RUN set -eux; \ | ||
python3 -m pip install -q --no-index --no-cache-dir /deephaven-jpy-wheel/*.whl; \ | ||
rm -r /deephaven-jpy-wheel | ||
|
||
COPY deephaven-wheel/ /deephaven-wheel | ||
RUN set -eux; \ | ||
python3 -m pip install -q --no-index --no-cache-dir /deephaven-wheel/*.whl; \ | ||
rm -r /deephaven-wheel | ||
|
||
COPY deephaven2-wheel/ /deephaven2-wheel | ||
RUN set -eux; \ | ||
python3 -m pip install -q --no-index --no-cache-dir /deephaven2-wheel/*.whl; \ | ||
rm -r /deephaven2-wheel | ||
|
||
FROM deephaven/java-and-python:local-build | ||
COPY --from=install-wheels / / |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
dill==0.3.4 | ||
llvmlite==0.37.0 | ||
numba==0.54.1 | ||
numpy==1.20.3 | ||
pandas==1.3.4 | ||
python-dateutil==2.8.2 | ||
pytz==2021.3 | ||
six==1.16.0 | ||
wrapt==1.13.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
eesh i wish we had dependencies instead of this stringy goo you hope you never forget...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the good news is that the gradle build will just fail to work if an evaluationDependsOn is missing. That said, it's not necessarily consistently failing - but hopefully it's obvious enough to us doing "things" in gradle how to fix it.