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/11/27 12:31:03 UTC

[incubator-streampipes-installer] 04/07: some local changes

This is an automated email from the ASF dual-hosted git repository.

wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-installer.git

commit 7546c7e48defbc4a06a8814fd0f815bea0aeb17f
Merge: 4cecfab 7ca6952
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Tue Nov 24 10:30:07 2020 +0100

    some local changes

 cli/.env                                           | 17 +++++++++++++++++
 cli/deploy/standalone/backend/docker-compose.yml   |  3 +++
 cli/deploy/standalone/mosquitto/docker-compose.yml |  2 +-
 cli/{.env => environments/edge}                    | 14 ++++++++------
 cli/{.env => environments/minimal}                 | 17 +++++++++++------
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --cc cli/.env
index 3112ecc,fc957cf..ccd30c9
--- a/cli/.env
+++ b/cli/.env
@@@ -18,4 -18,20 +18,21 @@@ SP_VERSION=0.68.0-SNAPSHO
  SP_SUBNET=172.31.0.0/16
  SP_CONSUL_CONTAINER_IP=172.31.0.9
  COMPOSE_PROJECT_NAME=streampipes
 +HOST_DOCKER_INTERNAL=192.168.65.2
+ 
+ # -------------------------------------------------------------
+ # 
+ # OPTIONAL environment variables to configure system on startup
+ #
+ # -------------------------------------------------------------
+ 
+ # Configuration to set prioritized protocol in backend service
+ # 
+ # options: kafka, mqtt, jms
+ # default: kafka
+ #SP_PRIORITIZED_PROTOCOL=mqtt
+ 
+ # Configuration to set MQTT host in backend service
+ # 
+ # default: activemq
+ #SP_MQTT_HOST=mosquitto
diff --cc cli/deploy/standalone/mosquitto/docker-compose.yml
index 5e5b07a,5e5b07a..f03c0e3
--- a/cli/deploy/standalone/mosquitto/docker-compose.yml
+++ b/cli/deploy/standalone/mosquitto/docker-compose.yml
@@@ -16,7 -16,7 +16,7 @@@
  version: "3.4"
  services:
    mosquitto:
--    image: eclipse-mosquitto:1.5.4
++    image: eclipse-mosquitto:1.6.12
      logging:
        driver: "json-file"
        options:
diff --cc cli/environments/edge
index 3112ecc,e9011ae..4b9dd4f
--- a/cli/environments/edge
+++ b/cli/environments/edge
@@@ -13,9 -13,9 +13,11 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
- SP_DOCKER_REGISTRY=apachestreampipes/
- SP_VERSION=0.68.0-SNAPSHOT
- SP_SUBNET=172.31.0.0/16
- SP_CONSUL_CONTAINER_IP=172.31.0.9
- COMPOSE_PROJECT_NAME=streampipes
- HOST_DOCKER_INTERNAL=192.168.65.2
 -version: "3.4"
 -services:
 -  consul:
 -    ports:
 -      - "8500:8500"
 -      - "8600:8600"
++[environment:edge]
++activemq
++kafka
++consul
++zookeeper
++couchdb
++influxdb
++mosquitto