You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/04/24 09:48:46 UTC
[incubator-streampipes] branch dev updated (3b05c64 -> 8c42857)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 3b05c64 Add missing license headers to a few files
new a7c0257 Add UI config for release 0.66.0
new 8c42857 Update settings to configure release validation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
DISCLAIMER-WIP | 2 +-
docker-compose.yml | 143 +++++++++++++++++++++
run-validation-system.sh | 1 +
ui/.dockerignore | 3 +
ui/deployment/prebuild.js | 9 +-
ui/deployment/{dev => rel}/config.yml | 7 +-
.../img/login => deployment/rel/img}/logo.png | Bin
.../rel/img}/sp-logo-right-white.png | Bin
ui/package.json | 1 +
ui/src/app/app-overview/app-overview.component.ts | 10 --
10 files changed, 156 insertions(+), 20 deletions(-)
create mode 100644 docker-compose.yml
create mode 100644 run-validation-system.sh
create mode 100644 ui/.dockerignore
copy ui/deployment/{dev => rel}/config.yml (82%)
copy ui/{src/assets/img/login => deployment/rel/img}/logo.png (100%)
copy ui/{src/assets/img/sp => deployment/rel/img}/sp-logo-right-white.png (100%)
[incubator-streampipes] 02/02: Update settings to configure release
validation
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 8c42857a3d4a8bb6d864ac61a9c7433fc15c985c
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Fri Apr 24 11:46:41 2020 +0200
Update settings to configure release validation
---
DISCLAIMER-WIP | 2 +-
docker-compose.yml | 143 +++++++++++++++++++++++++++++++++++++++++++
run-validation-system.sh | 1 +
ui/.dockerignore | 3 +
ui/deployment/prebuild.js | 11 ++--
ui/deployment/rel/config.yml | 6 +-
ui/package.json | 1 +
7 files changed, 157 insertions(+), 10 deletions(-)
diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP
index 1303011..e9caa3c 100644
--- a/DISCLAIMER-WIP
+++ b/DISCLAIMER-WIP
@@ -3,6 +3,6 @@ Incubator. Incubation is required of all newly accepted projects until a further
infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
Some of the incubating project’s releases may not be fully compliant with ASF policy. For example, releases may have incomplete or un-reviewed licensing conditions. What follows is a list of known issues the project is currently aware of (note that this list, by definition, is likely to be incomplete):
-
+(currently no issues are known)
If you are planning to incorporate this work into your product/project, please be aware that you will need to conduct a thorough licensing review to determine the overall implications of including this work. For the current status of this project through the Apache Incubator visit: https://incubator.apache.org/projects/streampipes.html
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..925137b
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,143 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# ============================================================
+# NOTICE
+# ============================================================
+# This docker-compose file is for validating releases only. To use StreamPipes, use the installation instructions
+# provided on https://streampipes.apache.org/download
+#
+
+
+version: "2"
+services:
+
+ #### apache/incubator-streampipes
+ backend:
+ build:
+ context: ./streampipes-backend
+ dockerfile: Dockerfile
+ args:
+ BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine-slim
+ depends_on:
+ - consul
+ - couchdb
+ networks:
+ spnet:
+
+ connect-master:
+ build:
+ context: ./streampipes-connect-container-master
+ dockerfile: Dockerfile
+ args:
+ BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine-slim
+ depends_on:
+ - consul
+ - couchdb
+ environment:
+ - EXECUTION_MODE=MASTER
+ - SP_CONNECT_CONTAINER_HOST=connect-master
+ - SP_CONNECT_CONTAINER_WORKER=connect-worker
+ networks:
+ spnet:
+
+ nginx:
+ build:
+ context: ./ui
+ dockerfile: Dockerfile
+ args:
+ BASE_IMAGE: nginx
+ ports:
+ - "80:80"
+ depends_on:
+ - couchdb
+ - activemq
+ - consul
+ - connect-master
+ - backend
+ networks:
+ spnet:
+
+ #### Mandatory external services
+ activemq:
+ image: fogsyio/activemq:5.15.9
+ networks:
+ spnet:
+
+ consul:
+ image: fogsyio/consul:1.7.1
+ environment:
+ - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}"
+ - "CONSUL_BIND_INTERFACE=eth0"
+ - "CONSUL_HTTP_ADDR=0.0.0.0"
+ entrypoint:
+ - consul
+ - agent
+ - -server
+ - -bootstrap-expect=1
+ - -data-dir=/consul/data
+ - -node=consul-one
+ - -bind={{ GetInterfaceIP "eth0" }}
+ - -client=0.0.0.0
+ - -enable-script-checks=true
+ - -ui
+ networks:
+ spnet:
+ ipv4_address: 172.31.0.9
+
+ couchdb:
+ image: fogsyio/couchdb:2.3.1
+ networks:
+ spnet:
+
+ kafka:
+ image: fogsyio/kafka:2.2.0
+ hostname: kafka
+ depends_on:
+ - zookeeper
+ environment:
+ # see: https://github.com/confluentinc/schema-registry/issues/648
+ KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT
+ KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://:9092
+ KAFKA_LISTENERS: PLAINTEXT://:9092
+ KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+ KAFKA_ADVERTISED_HOST_NAME: kafka
+ KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+ volumes:
+ - /var/run/docker.sock:/var/run/docker.sock
+ networks:
+ spnet:
+
+ zookeeper:
+ image: fogsyio/zookeeper:3.4.13
+ networks:
+ spnet:
+
+ influxdb:
+ image: fogsyio/influxdb:1.7
+ environment:
+ - INFLUXDB_DATA_ENGINE=tsm1
+ - INFLUXDB_REPORTING_DISABLED=false
+ - INFLUXDB_ADMIN_ENABLED=true
+ networks:
+ spnet:
+
+networks:
+ spnet:
+ driver: bridge
+ ipam:
+ config:
+ - subnet: 172.31.0.0/16
+ gateway: 172.31.0.1
diff --git a/run-validation-system.sh b/run-validation-system.sh
new file mode 100644
index 0000000..a2b62b6
--- /dev/null
+++ b/run-validation-system.sh
@@ -0,0 +1 @@
+docker-compose up -d && ../incubator-streampipes-extensions/docker-compose up -d
\ No newline at end of file
diff --git a/ui/.dockerignore b/ui/.dockerignore
new file mode 100644
index 0000000..7089457
--- /dev/null
+++ b/ui/.dockerignore
@@ -0,0 +1,3 @@
+node_modules/
+src/
+deployment/
\ No newline at end of file
diff --git a/ui/deployment/prebuild.js b/ui/deployment/prebuild.js
index 24663fa..7d392b7 100644
--- a/ui/deployment/prebuild.js
+++ b/ui/deployment/prebuild.js
@@ -22,21 +22,20 @@ mustache = require('mustache');
console.log('Pre-Build started.');
-// Get Branch Name from GitLab-CI
-let branchName = process.env.CI_COMMIT_REF_NAME;
+let branchName = process.env.BUILD_CONFIG.trim();
// If Branch Name is not valid, use "def"
if (branchName === undefined) {
- console.log('Environment Variable invalid. Using Config for dev-Branch.');
+ console.log('Environment variable BUILD_CONFIG not present. Using config for dev.');
branchName = 'dev';
} else {
console.log('Environment Variable valid. Using Config for ' + branchName + '-Branch.');
}
-// Check if Config-File for current Branch exists, otherwise use "def"
-if (!fs.existsSync('deployment/' + branchName + '/config.yml', 'utf8')) {
+// Check if Confgit stig-File for current Branch exists, otherwise use "def"
+if (!(fs.existsSync('deployment/' + branchName + '/config.yml'))) {
console.log('Could not find Config for ' + branchName + '-Branch. Using Config for dev-Branch.');
- branchName = 'rel';
+ branchName = 'dev';
}
// Read Config-File and check if it is valid
diff --git a/ui/deployment/rel/config.yml b/ui/deployment/rel/config.yml
index 321ac09..72dbae7 100644
--- a/ui/deployment/rel/config.yml
+++ b/ui/deployment/rel/config.yml
@@ -14,9 +14,9 @@
# limitations under the License.
login:
- backgroundImage: 'deployment/dev/img/background.png'
- logo: 'deployment/dev/img/logo.png'
- logo-right: 'deployment/dev/img/sp-logo-right-white.png'
+ backgroundImage: 'deployment/rel/img/background.png'
+ logo: 'deployment/rel/img/logo.png'
+ logo-right: 'deployment/rel/img/sp-logo-right-white.png'
modules:
- spEditor
- spPipelines
diff --git a/ui/package.json b/ui/package.json
index 535d790..2b1d91a 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -12,6 +12,7 @@
"watchtest": "node ./deployment/prebuild.js && karma start ./karma.conf.js --no-auto-watch --single-run",
"test": "node ./deployment/prebuild.js && karma start ./karma.conf.js",
"build": "node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --prod",
+ "build-rc": "set BUILD_CONFIG=rel && node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --prod",
"lint": "tslint -c tslint.json 'src/**/*.ts*"
},
"dependencies": {
[incubator-streampipes] 01/02: Add UI config for release 0.66.0
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit a7c025786121bad86e68d9fa5993338f8af93bd5
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Fri Apr 24 09:43:21 2020 +0200
Add UI config for release 0.66.0
---
ui/deployment/prebuild.js | 2 +-
ui/deployment/rel/config.yml | 28 ++++++++++++++++++++++
ui/deployment/rel/img/logo.png | Bin 0 -> 14358 bytes
ui/deployment/rel/img/sp-logo-right-white.png | Bin 0 -> 21453 bytes
ui/src/app/app-overview/app-overview.component.ts | 10 --------
5 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/ui/deployment/prebuild.js b/ui/deployment/prebuild.js
index c783004..24663fa 100644
--- a/ui/deployment/prebuild.js
+++ b/ui/deployment/prebuild.js
@@ -36,7 +36,7 @@ if (branchName === undefined) {
// Check if Config-File for current Branch exists, otherwise use "def"
if (!fs.existsSync('deployment/' + branchName + '/config.yml', 'utf8')) {
console.log('Could not find Config for ' + branchName + '-Branch. Using Config for dev-Branch.');
- branchName = 'dev';
+ branchName = 'rel';
}
// Read Config-File and check if it is valid
diff --git a/ui/deployment/rel/config.yml b/ui/deployment/rel/config.yml
new file mode 100644
index 0000000..321ac09
--- /dev/null
+++ b/ui/deployment/rel/config.yml
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+login:
+ backgroundImage: 'deployment/dev/img/background.png'
+ logo: 'deployment/dev/img/logo.png'
+ logo-right: 'deployment/dev/img/sp-logo-right-white.png'
+modules:
+ - spEditor
+ - spPipelines
+ - spConnect
+ - spDashboard
+ - spAppOverview
+ - spAdd
+ - spMyElements
+ - spConfiguration
\ No newline at end of file
diff --git a/ui/deployment/rel/img/logo.png b/ui/deployment/rel/img/logo.png
new file mode 100644
index 0000000..cbb8c56
Binary files /dev/null and b/ui/deployment/rel/img/logo.png differ
diff --git a/ui/deployment/rel/img/sp-logo-right-white.png b/ui/deployment/rel/img/sp-logo-right-white.png
new file mode 100644
index 0000000..ff2eb7c
Binary files /dev/null and b/ui/deployment/rel/img/sp-logo-right-white.png differ
diff --git a/ui/src/app/app-overview/app-overview.component.ts b/ui/src/app/app-overview/app-overview.component.ts
index b6eaf4d..465d38b 100644
--- a/ui/src/app/app-overview/app-overview.component.ts
+++ b/ui/src/app/app-overview/app-overview.component.ts
@@ -34,16 +34,6 @@ export class AppOverviewComponent {
appDescription: "Monitor measurements of your assets by placing visualizations on an image of your asset.",
appId: "asset-monitoring",
},
- {
- appName: "Transport Monitoring",
- appDescription: "Monitors the current transport status",
- appId: "transport-monitoring"
- },
- {
- appName: "Pallet 3D Model",
- appDescription: "View a virtual 3D model of a pallet.",
- appId: "pallet-3d-model"
- },
];
constructor() {