Skip to content

Commit

Permalink
Specify both IDE and embed-grid in the same Dockerfile
Browse files Browse the repository at this point in the history
At some point we could add ticket hash loading and/or code splitting on routes
  • Loading branch information
mofojed committed Feb 8, 2022
1 parent 0ae629d commit 5174e80
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 97 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ Set<Project> modsAreBasic = subprojects.findAll {it.name in [
'grpc-proxy',
'web',
'web-client-ui',
'web-client-embed-grid',
'pyclient',
'sphinx',
'docker-java-and-python',
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ String[] webMods = [
'web-client-api', // compiled javascript api client
'web-client-ide', // IDE-only additions to open-api javascript client
'web-client-ui', // React IDE client app
'web-client-embed-grid', // Embedded grid that can be used in iframes
'web-jupyter-grid', // React Jupyter grid client app
'web-shared-beans', // shared data types and common interfaces
'web-client-backplane', // shared data types and common interfaces
'open-api-lang-parser', // a javacc generated general-purpose language parser.
Expand Down
7 changes: 0 additions & 7 deletions web/client-embed-grid/.dockerignore

This file was deleted.

39 changes: 0 additions & 39 deletions web/client-embed-grid/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions web/client-embed-grid/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions web/client-embed-grid/README.md

This file was deleted.

30 changes: 0 additions & 30 deletions web/client-embed-grid/client-embed-grid.gradle

This file was deleted.

15 changes: 13 additions & 2 deletions web/client-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,19 @@ WORKDIR /usr/src/app

ARG WEB_VERSION=0.9.1

# Pull in the published package from npmjs and extract is
# Pull in the published code-studio package from npmjs and extract is
RUN set -eux; \
npm pack @deephaven/code-studio@${WEB_VERSION}; \
tar --touch -xf deephaven-code-studio-${WEB_VERSION}.tgz; \
rm deephaven-code-studio-${WEB_VERSION}.tgz;
mv package/build ide; \
rm -r package; \
rm deephaven-code-studio-${WEB_VERSION}.tgz;

# Pull in the published embed-grid package from npmjs and extract is
RUN set -eux; \
npm pack @deephaven/embed-grid@${WEB_VERSION}; \
tar --touch -xf deephaven-embed-grid-${WEB_VERSION}.tgz; \
mkdir iframe; \
mv package/build iframe/table; \
rm -r package; \
rm deephaven-embed-grid-${WEB_VERSION}.tgz;
4 changes: 2 additions & 2 deletions web/client-ui/client-ui.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ def ui = Docker.registerDockerTask(project, 'ui') {
from file('Dockerfile')
}
parentContainers = [ Docker.registryTask(project, 'node') ]
containerOutPath = '/usr/src/app/package/build'
containerOutPath = '/usr/src/app/'
imageName = 'deephaven/dhide:local-build'
copyOut {
into dhUi.get().dir('ide')
into dhUi.get()
}
}

Expand Down
1 change: 0 additions & 1 deletion web/web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ archivesBaseName = "deephaven-web"
dependencies {
js project(path: ':web-client-ui', configuration: 'js')
js project(path: ':web-client-ide', configuration: 'js')
js project(path: ':web-client-embed-grid', configuration: 'js')
}

/**
Expand Down

0 comments on commit 5174e80

Please sign in to comment.