From 81ba5376e99d684d11f6e739d20ae0dc6682ec03 Mon Sep 17 00:00:00 2001 From: Masterjx9 <82799287+Masterjx9@users.noreply.github.com> Date: Wed, 2 Nov 2022 10:52:01 -0700 Subject: [PATCH 1/5] Added Dot demo for powershell It uses a check to ensure dot is up before hand instead of using a 30 wait timer --- run_dot_demo.ps1 | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 run_dot_demo.ps1 diff --git a/run_dot_demo.ps1 b/run_dot_demo.ps1 new file mode 100644 index 0000000..a309a36 --- /dev/null +++ b/run_dot_demo.ps1 @@ -0,0 +1,43 @@ +# # First clean up any previous demos +cd demo +if (test-path './db') { + remove-item './db' -Recurse + } +if (test-path './appsmith') { +remove-item './appsmith' -Recurse +} +if (test-path '*.tar*') { +remove-item '*.tar*' +} + + +# Download test data +wget "https://drive.google.com/uc?export=download&id=157Iad8mHnwbZ_dAeLQy5XfLihhcpD6yc" -O "dot_demo_data.tar.gz" +bash gunzip dot_demo_data.tar.gz +bash tar -xvf dot_demo_data.tar +cd .. + +Write-Output "Starting DOT ..." + +set POSTGRES_PASSWORD=password125 +docker compose -f docker-compose-demo.yml down -v +docker compose -f docker-compose-demo.yml build +sleep 5 +docker compose -f docker-compose-demo.yml up -d + +Write-Output "Waiting for DOT to start, time to make a nice cup of tea! ☕ 😃 ..." + + +$Dotupcheck= $false +While ($Dotupcheck= $false){ +$Dotdemostatus=docker ps --filter "ancestor=datakindorg/dot_appsmith" +if ($Dotdemostatus[1] -contains "healthy") { + $Dotupcheck= $true + } + else { + sleep 5 + } +} +Write-Output "Open a browser and go to this URL: " +Write-Output " http://localhost:82/app/data-observation-toolkit/run-log-634491ea0da61b0e9f38760d?embed=True" +Write-Output "To STOP DOT run this command: docker compose -f docker-compose-demo.yml stop" \ No newline at end of file From e8f300072bfbad713694c40582aed4affe368ca2 Mon Sep 17 00:00:00 2001 From: Masterjx9 <82799287+Masterjx9@users.noreply.github.com> Date: Wed, 2 Nov 2022 11:13:40 -0700 Subject: [PATCH 2/5] Delete run_dot_demo.ps1 --- run_dot_demo.ps1 | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 run_dot_demo.ps1 diff --git a/run_dot_demo.ps1 b/run_dot_demo.ps1 deleted file mode 100644 index a309a36..0000000 --- a/run_dot_demo.ps1 +++ /dev/null @@ -1,43 +0,0 @@ -# # First clean up any previous demos -cd demo -if (test-path './db') { - remove-item './db' -Recurse - } -if (test-path './appsmith') { -remove-item './appsmith' -Recurse -} -if (test-path '*.tar*') { -remove-item '*.tar*' -} - - -# Download test data -wget "https://drive.google.com/uc?export=download&id=157Iad8mHnwbZ_dAeLQy5XfLihhcpD6yc" -O "dot_demo_data.tar.gz" -bash gunzip dot_demo_data.tar.gz -bash tar -xvf dot_demo_data.tar -cd .. - -Write-Output "Starting DOT ..." - -set POSTGRES_PASSWORD=password125 -docker compose -f docker-compose-demo.yml down -v -docker compose -f docker-compose-demo.yml build -sleep 5 -docker compose -f docker-compose-demo.yml up -d - -Write-Output "Waiting for DOT to start, time to make a nice cup of tea! ☕ 😃 ..." - - -$Dotupcheck= $false -While ($Dotupcheck= $false){ -$Dotdemostatus=docker ps --filter "ancestor=datakindorg/dot_appsmith" -if ($Dotdemostatus[1] -contains "healthy") { - $Dotupcheck= $true - } - else { - sleep 5 - } -} -Write-Output "Open a browser and go to this URL: " -Write-Output " http://localhost:82/app/data-observation-toolkit/run-log-634491ea0da61b0e9f38760d?embed=True" -Write-Output "To STOP DOT run this command: docker compose -f docker-compose-demo.yml stop" \ No newline at end of file From 549f4db1a154d3fd0231d0ac32de4b1d77510ed3 Mon Sep 17 00:00:00 2001 From: Masterjx9 <82799287+Masterjx9@users.noreply.github.com> Date: Wed, 2 Nov 2022 11:14:22 -0700 Subject: [PATCH 3/5] added run_dot_demo.ps1 added powershell file to run dot demo --- docker/run_dot_demo.ps1 | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 docker/run_dot_demo.ps1 diff --git a/docker/run_dot_demo.ps1 b/docker/run_dot_demo.ps1 new file mode 100644 index 0000000..a309a36 --- /dev/null +++ b/docker/run_dot_demo.ps1 @@ -0,0 +1,43 @@ +# # First clean up any previous demos +cd demo +if (test-path './db') { + remove-item './db' -Recurse + } +if (test-path './appsmith') { +remove-item './appsmith' -Recurse +} +if (test-path '*.tar*') { +remove-item '*.tar*' +} + + +# Download test data +wget "https://drive.google.com/uc?export=download&id=157Iad8mHnwbZ_dAeLQy5XfLihhcpD6yc" -O "dot_demo_data.tar.gz" +bash gunzip dot_demo_data.tar.gz +bash tar -xvf dot_demo_data.tar +cd .. + +Write-Output "Starting DOT ..." + +set POSTGRES_PASSWORD=password125 +docker compose -f docker-compose-demo.yml down -v +docker compose -f docker-compose-demo.yml build +sleep 5 +docker compose -f docker-compose-demo.yml up -d + +Write-Output "Waiting for DOT to start, time to make a nice cup of tea! ☕ 😃 ..." + + +$Dotupcheck= $false +While ($Dotupcheck= $false){ +$Dotdemostatus=docker ps --filter "ancestor=datakindorg/dot_appsmith" +if ($Dotdemostatus[1] -contains "healthy") { + $Dotupcheck= $true + } + else { + sleep 5 + } +} +Write-Output "Open a browser and go to this URL: " +Write-Output " http://localhost:82/app/data-observation-toolkit/run-log-634491ea0da61b0e9f38760d?embed=True" +Write-Output "To STOP DOT run this command: docker compose -f docker-compose-demo.yml stop" \ No newline at end of file From 24b701c446ae0051182fd88d2baa29d017e54181 Mon Sep 17 00:00:00 2001 From: Dividor Date: Wed, 9 Nov 2022 12:04:49 -0500 Subject: [PATCH 4/5] Minro formating fix --- docker/run_dot_demo.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/run_dot_demo.ps1 b/docker/run_dot_demo.ps1 index a309a36..d3dae4e 100644 --- a/docker/run_dot_demo.ps1 +++ b/docker/run_dot_demo.ps1 @@ -4,10 +4,10 @@ if (test-path './db') { remove-item './db' -Recurse } if (test-path './appsmith') { -remove-item './appsmith' -Recurse + remove-item './appsmith' -Recurse } if (test-path '*.tar*') { -remove-item '*.tar*' + remove-item '*.tar*' } @@ -40,4 +40,4 @@ if ($Dotdemostatus[1] -contains "healthy") { } Write-Output "Open a browser and go to this URL: " Write-Output " http://localhost:82/app/data-observation-toolkit/run-log-634491ea0da61b0e9f38760d?embed=True" -Write-Output "To STOP DOT run this command: docker compose -f docker-compose-demo.yml stop" \ No newline at end of file +Write-Output "To STOP DOT run this command: docker compose -f docker-compose-demo.yml stop" From 69c1902e118d95033f779640c8f5a0ef8f961145 Mon Sep 17 00:00:00 2001 From: Dividor Date: Wed, 9 Nov 2022 12:07:59 -0500 Subject: [PATCH 5/5] Added README instructions for new powershell demo script --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f08eb63..9b99add 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,8 @@ The fastest way to get started using DOT is to use the Docker environment and de downloading and unzipping the repository zip file 2. Start Docker 3. Open a Terminal and `cd` into the `docker` sub-folder of where you installed DOT -4. Then run this command: `./run_dot_demo.sh` -5. Finally, open the DOT user interface by opening [this url](http://localhost:82/app/data-observation-toolkit/run-log-634491ea0da61b0e9f38760d?embed=True), +4. Then run this command if on Mac or Linux, `./run_dot_demo.sh`. If on Windows run `run_dot_demo.ps1` +6. Finally, open the DOT user interface by opening [this url](http://localhost:82/app/data-observation-toolkit/run-log-634491ea0da61b0e9f38760d?embed=True), in a web browser See below for quick demo of DOT.