fix: Update Docker Compose example to 7.1.0-M11 (#129)

Activiti · Dec 16, 2020 · cd5a4c6 · cd5a4c6
1 parent c1e2e87
commit cd5a4c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/docker-compose/.env b/docker-compose/.env
@@ -1,4 +1,4 @@
 DOCKER_IP=Your IP is here(not localhost)
-VERSION=7.1.0.M5
+VERSION=7.1.0-M11
 KEYCLOAK_REALM=activiti
 KEYCLOAK_RESOURCE=activiti
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -134,7 +134,8 @@ services:
       APP_CONFIG_OAUTH2_HOST: "http://${DOCKER_IP}/auth/realms/${KEYCLOAK_REALM}"
       APP_CONFIG_OAUTH2_CLIENTID: "${KEYCLOAK_REALM}"
       API_URL: "http://${DOCKER_IP}"
-      BASE_PATH: /modeling/
+      BASE_PATH: /modeling
+      SERVER_PORT: 8080
       APP_CONFIG_BPM_HOST: "http://${DOCKER_IP}"
       APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI: /modeling/assets/silent-refresh.html
       APP_CONFIG_OAUTH2_REDIRECT_LOGIN: /modeling

diff --git a/docker-compose/nginx.conf b/docker-compose/nginx.conf
@@ -79,7 +79,7 @@ http {
         }
         location ~ ^/modeling-service/?(.*)$ {
             resolver 127.0.0.11 ipv6=off;
-            set $upstream activiti-cloud-modeling-backend:8080;            
+            set $upstream activiti-cloud-modeling-backend:8080;
 
             proxy_pass         http://$upstream/modeling-service/$1?$args;
             proxy_redirect     off;
@@ -88,11 +88,11 @@ http {
             proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header   X-Forwarded-Host $server_name;
         }
-        location ~ ^/modeling/?(.*) {
+        location ~ ^/modeling {
             resolver 127.0.0.11 ipv6=off;
-            set $upstream activiti-cloud-modeling;            
+            set $upstream activiti-cloud-modeling:8080;
 
-            proxy_pass         http://$upstream/$1;
+            proxy_pass         http://$upstream;
             proxy_redirect     off;
             proxy_set_header   Host $host;
             proxy_set_header   X-Real-IP $remote_addr;