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 2022/02/06 18:58:23 UTC
[incubator-streampipes] branch experimental-module-federation-494 updated (6080ce8 -> 67c37dd)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch experimental-module-federation-494
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 6080ce8 [STREAMPIPES-509] Remove ActiveMQ dependency from installer files
new aec3e4d [STREAMPIPES-509] Remove ActiveMQ from docker-compose
new 67c37dd [STREAMPIPES-509] Remove ActiveMQ from proxies
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:
docker-compose.yml | 10 +---------
ui/deployment/webpack.partial.dev.js | 7 +------
ui/nginx_config/default.conf | 11 -----------
ui/nginx_config/ssl.conf | 11 -----------
4 files changed, 2 insertions(+), 37 deletions(-)
[incubator-streampipes] 01/02: [STREAMPIPES-509] Remove ActiveMQ from docker-compose
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation-494
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit aec3e4d1d2c141b61a422bba907a0f453d41b2b6
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sun Feb 6 19:56:38 2022 +0100
[STREAMPIPES-509] Remove ActiveMQ from docker-compose
---
docker-compose.yml | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 4acb0f6..32676dc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -62,7 +62,6 @@ services:
- "80:80"
depends_on:
- couchdb
- - activemq
- consul
- backend
logging: *default-logging
@@ -96,13 +95,6 @@ services:
networks:
spnet:
- #### Mandatory external services
- activemq:
- image: fogsyio/activemq:5.15.9
- logging: *default-logging
- networks:
- spnet:
-
consul:
image: fogsyio/consul:1.7.1
environment:
@@ -190,4 +182,4 @@ networks:
driver: bridge
ipam:
config:
- - subnet: 172.31.0.0/16
\ No newline at end of file
+ - subnet: 172.31.0.0/16
[incubator-streampipes] 02/02: [STREAMPIPES-509] Remove ActiveMQ from proxies
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation-494
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 67c37ddd4ce39883d7c7946f451f09e2e8ffe179
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sun Feb 6 19:58:08 2022 +0100
[STREAMPIPES-509] Remove ActiveMQ from proxies
---
ui/deployment/webpack.partial.dev.js | 7 +------
ui/nginx_config/default.conf | 11 -----------
ui/nginx_config/ssl.conf | 11 -----------
3 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/ui/deployment/webpack.partial.dev.js b/ui/deployment/webpack.partial.dev.js
index d26b0fe..1c1b940 100644
--- a/ui/deployment/webpack.partial.dev.js
+++ b/ui/deployment/webpack.partial.dev.js
@@ -54,12 +54,7 @@ module.exports = merge(baseConfig, {
'/pipeline': {
target: 'http://localhost:5984',
secure: false,
- },
- '/streampipes/ws': {
- target: 'ws://localhost:61614',
- ws: true,
- secure: false,
- },
+ }
},
},
});
diff --git a/ui/nginx_config/default.conf b/ui/nginx_config/default.conf
index 6094ef3..b6126a4 100644
--- a/ui/nginx_config/default.conf
+++ b/ui/nginx_config/default.conf
@@ -105,17 +105,6 @@ server {
proxy_redirect off;
}
- # Websockets
-
- location /streampipes/ws {
- set $upstream activemq:61614;
-
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "upgrade";
- proxy_http_version 1.1;
- proxy_pass http://$upstream;
- }
-
location /swagger {
set $upstream swagger-ui:8080;
diff --git a/ui/nginx_config/ssl.conf b/ui/nginx_config/ssl.conf
index b94a037..181d348 100644
--- a/ui/nginx_config/ssl.conf
+++ b/ui/nginx_config/ssl.conf
@@ -100,17 +100,6 @@ server {
proxy_redirect off;
}
- # Websockets
-
- location /streampipes/ws {
- set $upstream activemq:61614;
-
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "upgrade";
- proxy_http_version 1.1;
- proxy_pass http://$upstream;
- }
-
location /swagger {
set $upstream swagger-ui:8080;