You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/04/27 09:37:03 UTC
[incubator-streampipes-installer] branch dev updated: add project
name for docker-compose installation, installation info
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-installer.git
The following commit(s) were added to refs/heads/dev by this push:
new e3670bb add project name for docker-compose installation, installation info
e3670bb is described below
commit e3670bb2e8ae6554b41d3a46172ae2efbd1cd7a9
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Mon Apr 27 11:35:40 2020 +0200
add project name for docker-compose installation, installation info
---
installer/osx_linux/streampipes | 14 +++++++-------
installer/templates/.env | 1 +
installer/windows10/streampipes.ps1 | 12 ++++++++----
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/installer/osx_linux/streampipes b/installer/osx_linux/streampipes
index d6f8062..3c6b677 100755
--- a/installer/osx_linux/streampipes
+++ b/installer/osx_linux/streampipes
@@ -59,24 +59,24 @@ if [ ! -f ./docker-compose.yml ];
else
case $opt in
"StreamPipes Lite (few pipeline elements, needs less memory)")
- version="lite"
+ version="Lite"
;;
"StreamPipes Full (more pipeline elements, requires > 16 GB RAM)")
- version="full"
+ version="Full"
;;
esac
break
fi
done
- echo $version;
- if [ $version == "lite" ];
+
+ echo "Selected StreamPipes option: $version";
+
+ echo "Configuring StreamPipes $version"
+ if [ $version == "Lite" ];
then
- echo 'Configuring StreamPipes Lite'
cp ../templates/docker-compose.lite.yml ./docker-compose.yml
-
else
- echo 'Configuring StreamPipes Full'
cp ../templates/docker-compose.full.yml ./docker-compose.yml
fi
diff --git a/installer/templates/.env b/installer/templates/.env
index bcf77db..3a5824f 100644
--- a/installer/templates/.env
+++ b/installer/templates/.env
@@ -15,3 +15,4 @@
SP_VERSION=0.65.1-SNAPSHOT
SP_DOCKER_REGISTRY=apachestreampipes
+COMPOSE_PROJECT_NAME=streampipes
diff --git a/installer/windows10/streampipes.ps1 b/installer/windows10/streampipes.ps1
index 3bdef88..37ca46c 100644
--- a/installer/windows10/streampipes.ps1
+++ b/installer/windows10/streampipes.ps1
@@ -58,11 +58,11 @@ if ($args[0] -eq "start")
switch ($input)
{
'1' {
- $version="lite"
+ $version="Lite"
break
} '2' {
- $version="full"
+ $version="Full"
break
}
}
@@ -70,12 +70,16 @@ if ($args[0] -eq "start")
}
until (($input -eq '1') -Or ($input -eq '2'))
+ Write-Host "Selected StreamPipes option: $version"
+
+ Write-Host "Configuring StreamPipes $version"
+
Copy-Item $envFileTemp -Destination $envFileDest
- if ($version -eq "lite")
+ if ($version -eq "Lite")
{
Copy-Item $dockerComposeLiteTemp -Destination $dockerCompose
}
- if ($version -eq "full")
+ if ($version -eq "Full")
{
Copy-Item $dockerComposeFullTemp -Destination $dockerCompose
}