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 2023/02/23 18:55:51 UTC
[streampipes] branch dev updated: Support backend-only development mode (#1327) (#1339)
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/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 53e19f439 Support backend-only development mode (#1327) (#1339)
53e19f439 is described below
commit 53e19f439e10484d2980ff30abb83bb5cf87a9c5
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Feb 23 19:55:43 2023 +0100
Support backend-only development mode (#1327) (#1339)
* Support backend-only development mode (#1327)
* Remove extensions-all-jvm service from backend environment (#1327)
* Remove comment
---
.../extensions-all-jvm/docker-compose.dev.yml | 4 +-
.../extensions-all-jvm/docker-compose.yml | 1 -
.../deploy/standalone/ui-custom-conf/default.conf | 47 ++++++++++++++++++++++
.../ui-custom-conf/docker-compose.dev.yml} | 13 +++---
.../docker-compose.yml | 14 +++----
installer/cli/environments/backend | 3 +-
installer/cli/environments/backend-nats | 3 +-
7 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml
index 9dea6293e..1c7453269 100644
--- a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml
+++ b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml
@@ -18,5 +18,5 @@ services:
extensions-all-jvm:
labels:
org.apache.streampipes.dev.extensions-all-jvm.service.description: "Dev extensions-all-jvm service"
-# ports:
-# - "8098:8090"
+ ports:
+ - "8090:8090"
diff --git a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
index f8662641b..287b34dfd 100644
--- a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
+++ b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
@@ -19,7 +19,6 @@ services:
image: ${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}
depends_on:
- consul
- - backend
- couchdb
volumes:
- files:/spImages
diff --git a/installer/cli/deploy/standalone/ui-custom-conf/default.conf b/installer/cli/deploy/standalone/ui-custom-conf/default.conf
new file mode 100644
index 000000000..3ba0a7803
--- /dev/null
+++ b/installer/cli/deploy/standalone/ui-custom-conf/default.conf
@@ -0,0 +1,47 @@
+# 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.
+
+server {
+ listen 80 default_server;
+ resolver 127.0.0.11;
+
+ root /usr/share/nginx/html;
+
+ # Enable gzip compression
+ gzip on;
+ gzip_static on;
+ gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+ gzip_proxied any;
+ gzip_vary on;
+ gzip_comp_level 6;
+ gzip_buffers 16 8k;
+ gzip_http_version 1.1;
+
+ # StreamPipes
+
+ location /streampipes-backend {
+
+# When running the backend locally and the UI in Docker, change the upstream to an IP resolvable from within Docker
+ set $upstream host.docker.internal:8030;
+
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-NginX-Proxy true;
+ proxy_pass http://$upstream;
+ proxy_ssl_session_reuse off;
+ proxy_set_header Host $http_host;
+ proxy_redirect off;
+ }
+}
diff --git a/installer/cli/environments/backend b/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.dev.yml
similarity index 85%
copy from installer/cli/environments/backend
copy to installer/cli/deploy/standalone/ui-custom-conf/docker-compose.dev.yml
index 175482356..51fe0bc7f 100644
--- a/installer/cli/environments/backend
+++ b/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.dev.yml
@@ -13,11 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-[environment:backend]
-kafka
-consul
-zookeeper
-couchdb
-influxdb
-extensions-all-jvm
-ui
+version: "3.4"
+services:
+ ui-custom-conf:
+ labels:
+ org.apache.streampipes.dev.ui.service.description: "Dev UI service"
diff --git a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml b/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml
similarity index 84%
copy from installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
copy to installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml
index f8662641b..917e90b54 100644
--- a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
+++ b/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml
@@ -15,14 +15,15 @@
version: "3.4"
services:
- extensions-all-jvm:
- image: ${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}
+ ui-custom-conf:
+ image: ${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}
+ ports:
+ - "80:80"
depends_on:
+ - couchdb
- consul
- - backend
- - couchdb
volumes:
- - files:/spImages
+ - "../ui-custom-conf/default.conf:/etc/nginx/conf.d/default.conf"
logging:
driver: "json-file"
options:
@@ -31,9 +32,6 @@ services:
networks:
spnet:
-volumes:
- files:
-
networks:
spnet:
external: true
diff --git a/installer/cli/environments/backend b/installer/cli/environments/backend
index 175482356..798a732ce 100644
--- a/installer/cli/environments/backend
+++ b/installer/cli/environments/backend
@@ -19,5 +19,4 @@ consul
zookeeper
couchdb
influxdb
-extensions-all-jvm
-ui
+ui-custom-conf
diff --git a/installer/cli/environments/backend-nats b/installer/cli/environments/backend-nats
index 2abf3dee5..550c54169 100644
--- a/installer/cli/environments/backend-nats
+++ b/installer/cli/environments/backend-nats
@@ -18,5 +18,4 @@ consul
couchdb
influxdb
nats
-extensions-all-jvm
-ui
+ui-custom-conf