From eed90ca45f9aea51af789c44bf7e07af41f0e549 Mon Sep 17 00:00:00 2001 From: Seth Ahrenbach Date: Fri, 10 May 2024 09:22:16 -0500 Subject: [PATCH 1/2] feat(containerize): mall changes required for containerized local development, plus improved README --- README.md | 10 ++++++---- package.json | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e5a788771..bc1c7fe95 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ Questions? Ask them in the [forum](https://groups.google.com/forum/#!forum/opens ## Prerequisites * Java 1.7.0+ -* Node/NPM -* Python +* Node 20 +* Python 3 ## Getting Started OpenSphere is natively developed on Linux and should run great on OS X and typical Linux distributions. See [Windows Development](http://opensphere.readthedocs.io/en/latest/windows_development.html) for instructions for building on Windows. @@ -34,7 +34,8 @@ OpenSphere is natively developed on Linux and should run great on OS X and typic * Clone OpenSphere to the `workspace` directory * `yarn install` * `yarn build` -* Point your browser at `dist/opensphere` +* `npm run start-server` +* Point your browser at `workspace/opensphere/dist/opensphere/index.html` ### NPM @@ -43,7 +44,8 @@ If you prefer to use NPM, that's fine too: * Clone the project * `npm install` * `npm run build` -* Point your browser at `dist/opensphere` +* `npm run start-server` +* Point your browser at `localhost:8282/workspace/opensphere/dist/opensphere/index.html` ## Hosting diff --git a/package.json b/package.json index 4d0c557df..c98d7043e 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "package:update": "if git diff --name-only ORIG_HEAD HEAD | grep --quiet package.json; then echo 'UPDATE: package.json was updated, consider running yarn in your workspace root'; fi", "perms": "chmod -R u+rwX,go+rX,go-w .", "semantic-release": "semantic-release --dry-run", - "start-server": "light-server --serve ../../ --bind localhost --port 8282 --no-reload --open --quiet &", + "start-server": "light-server --serve ../../ --bind 0.0.0.0 --port 8282 --no-reload --open --quiet", "stop-server": "run-script-os", "stop-server:darwin:linux": "pkill -f light-server", "stop-server:windows": "taskkill -F -PID $(netstat -ano | findstr 0.0.0.0:8282 | awk '{print $5}')", From d1b5642a835b21f092488f4505f0cbd42c0ff9f3 Mon Sep 17 00:00:00 2001 From: Seth Ahrenbach Date: Tue, 14 May 2024 10:52:41 -0500 Subject: [PATCH 2/2] feat(containerize): use container-start-server as script for containerization --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c98d7043e..3a09f2ca5 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,8 @@ "package:update": "if git diff --name-only ORIG_HEAD HEAD | grep --quiet package.json; then echo 'UPDATE: package.json was updated, consider running yarn in your workspace root'; fi", "perms": "chmod -R u+rwX,go+rX,go-w .", "semantic-release": "semantic-release --dry-run", - "start-server": "light-server --serve ../../ --bind 0.0.0.0 --port 8282 --no-reload --open --quiet", + "start-server": "light-server --serve ../../ --bind localhost --port 8282 --no-reload --open --quiet &", + "container-start-server": "light-server --serve ../../ --bind 0.0.0.0 --port 8282 --no-reload --open --quiet", "stop-server": "run-script-os", "stop-server:darwin:linux": "pkill -f light-server", "stop-server:windows": "taskkill -F -PID $(netstat -ano | findstr 0.0.0.0:8282 | awk '{print $5}')",