Skip to content

Commit

Permalink
feat: Update front-end to 3.8.3 back-end 3.2.3. (#98)
Browse files Browse the repository at this point in the history
* feat: Update front-end to `3.8.3` back-end `3.2.3`.

* update envoy proxy.
  • Loading branch information
EdwinBetanc0urt committed May 7, 2024
1 parent 3be6466 commit 72b1199
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 12 deletions.
12 changes: 6 additions & 6 deletions docker-compose/.env
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ OPENSEARCH_DASHBOARDS_EXTERNAL_PORT=5601
OPENSEARCH_DASHBOARDS_OPENSEARCH_HOSTS="[\"http://${OPENSEARCH_HOSTNAME}:${OPENSEARCH_PORT}\"]"

# OpenSearch API RESTful
DICTIONARY_RS_IMAGE="openls/dictionary-rs:1.2.0"
DICTIONARY_RS_IMAGE="openls/dictionary-rs:1.2.1"
DICTIONARY_RS_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.dictionary.rs"
DICTIONARY_RS_HOSTNAME="${CLIENT_NAME}.dictionary"
DICTIONARY_RS_PORT=7878
Expand All @@ -201,7 +201,7 @@ DICTIONARY_RS_OPENSEARCH_URL="http://${OPENSEARCH_CONTAINER_NAME}:${OPENSEARCH_P


# ADempiere Vue Backend (gRPC Server)
VUE_BACKEND_GRPC_SERVER_VERSION="3.2.1"
VUE_BACKEND_GRPC_SERVER_VERSION="3.2.3"
VUE_BACKEND_GRPC_SERVER_IMAGE="solopcloud/adempiere-backend:alpine-${VUE_BACKEND_GRPC_SERVER_VERSION}"
VUE_BACKEND_GRPC_SERVER_CONTAINER_NAME=${COMPOSE_PROJECT_NAME}.vue.grpc.server
VUE_BACKEND_GRPC_SERVER_HOSTNAME=${CLIENT_NAME}-grpc
Expand All @@ -217,7 +217,7 @@ VUE_BACKEND_GRPC_SERVER_PORT=50059


# Envoy Proxy Definition for Processors/Backend
ENVOY_GRPC_PROXY_IMAGE="envoyproxy/envoy:v1.29.2"
ENVOY_GRPC_PROXY_IMAGE="envoyproxy/envoy:v1.29.4"
ENVOY_GRPC_PROXY_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.envoy.grpc.proxy"
ENVOY_GRPC_PROXY_HOSTNAME="${CLIENT_NAME}.envoy"
ENVOY_GRPC_PROXY_BACKEND_IMAGE="solopcloud/adempiere-grpc-proxy:${VUE_BACKEND_GRPC_SERVER_VERSION}" # Used only in docker-compose-vue.yml.
Expand All @@ -231,7 +231,7 @@ ENVOY_GRPC_PROXY_PROCESSOR_PORT=5556


# NGINX UI Gateway
NGINX_UI_GATEWAY_IMAGE="nginx:1.25.4-alpine3.18"
NGINX_UI_GATEWAY_IMAGE="nginx:1.26.0-alpine3.19"
NGINX_UI_GATEWAY_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.nginx.ui.gateway"
NGINX_UI_GATEWAY_HOSTNAME="${CLIENT_NAME}.nginx"
NGINX_UI_GATEWAY_EXTERNAL_PORT=80
Expand All @@ -241,7 +241,7 @@ NGINX_UI_GATEWAY_VOLUME="${COMPOSE_PROJECT_NAME}.volume_nginx" #


# ADempiere UI Vue
VUE_UI_IMAGE="solopcloud/adempiere-vue:alpine-3.8.1"
VUE_UI_IMAGE="solopcloud/adempiere-vue:alpine-3.8.3"
VUE_UI_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.vue.ui"
VUE_UI_HOSTNAME="${CLIENT_NAME}.vue.ui"
VUE_UI_EXTERNAL_PORT=9526
Expand All @@ -252,7 +252,7 @@ VUE_UI_PUBLIC_PATH="/vue/"

# Keycloak identity and access management
# KEYCLOAK_IMAGE="jboss/keycloak:16.1.1"
KEYCLOAK_IMAGE="keycloak/keycloak:23.0.6-0"
KEYCLOAK_IMAGE="keycloak/keycloak:23.0.7"
KEYCLOAK_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.keycloak.service"
KEYCLOAK_HOSTNAME="${CLIENT_NAME}.keycloak"
KEYCLOAK_PORT=8080
Expand Down
12 changes: 6 additions & 6 deletions docker-compose/env_template.env
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ OPENSEARCH_DASHBOARDS_EXTERNAL_PORT=5601
OPENSEARCH_DASHBOARDS_OPENSEARCH_HOSTS="[\"http://${OPENSEARCH_HOSTNAME}:${OPENSEARCH_PORT}\"]"

# OpenSearch API RESTful
DICTIONARY_RS_IMAGE="openls/dictionary-rs:1.2.0"
DICTIONARY_RS_IMAGE="openls/dictionary-rs:1.2.1"
DICTIONARY_RS_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.dictionary.rs"
DICTIONARY_RS_HOSTNAME="${CLIENT_NAME}.dictionary"
DICTIONARY_RS_PORT=7878
Expand All @@ -201,7 +201,7 @@ DICTIONARY_RS_OPENSEARCH_URL="http://${OPENSEARCH_CONTAINER_NAME}:${OPENSEARCH_P


# ADempiere Vue Backend (gRPC Server)
VUE_BACKEND_GRPC_SERVER_VERSION="3.2.1"
VUE_BACKEND_GRPC_SERVER_VERSION="3.2.3"
VUE_BACKEND_GRPC_SERVER_IMAGE="solopcloud/adempiere-backend:alpine-${VUE_BACKEND_GRPC_SERVER_VERSION}"
VUE_BACKEND_GRPC_SERVER_CONTAINER_NAME=${COMPOSE_PROJECT_NAME}.vue.grpc.server
VUE_BACKEND_GRPC_SERVER_HOSTNAME=${CLIENT_NAME}-grpc
Expand All @@ -217,7 +217,7 @@ VUE_BACKEND_GRPC_SERVER_PORT=50059


# Envoy Proxy Definition for Processors/Backend
ENVOY_GRPC_PROXY_IMAGE="envoyproxy/envoy:v1.29.2"
ENVOY_GRPC_PROXY_IMAGE="envoyproxy/envoy:v1.29.4"
ENVOY_GRPC_PROXY_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.envoy.grpc.proxy"
ENVOY_GRPC_PROXY_HOSTNAME="${CLIENT_NAME}.envoy"
ENVOY_GRPC_PROXY_BACKEND_IMAGE="solopcloud/adempiere-grpc-proxy:${VUE_BACKEND_GRPC_SERVER_VERSION}" # Used only in docker-compose-vue.yml.
Expand All @@ -231,7 +231,7 @@ ENVOY_GRPC_PROXY_PROCESSOR_PORT=5556


# NGINX UI Gateway
NGINX_UI_GATEWAY_IMAGE="nginx:1.25.4-alpine3.18"
NGINX_UI_GATEWAY_IMAGE="nginx:1.26.0-alpine3.19"
NGINX_UI_GATEWAY_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.nginx.ui.gateway"
NGINX_UI_GATEWAY_HOSTNAME="${CLIENT_NAME}.nginx"
NGINX_UI_GATEWAY_EXTERNAL_PORT=80
Expand All @@ -241,7 +241,7 @@ NGINX_UI_GATEWAY_VOLUME="${COMPOSE_PROJECT_NAME}.volume_nginx" #


# ADempiere UI Vue
VUE_UI_IMAGE="solopcloud/adempiere-vue:alpine-3.8.1"
VUE_UI_IMAGE="solopcloud/adempiere-vue:alpine-3.8.3"
VUE_UI_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.vue.ui"
VUE_UI_HOSTNAME="${CLIENT_NAME}.vue.ui"
VUE_UI_EXTERNAL_PORT=9526
Expand All @@ -252,7 +252,7 @@ VUE_UI_PUBLIC_PATH="/vue/"

# Keycloak identity and access management
# KEYCLOAK_IMAGE="jboss/keycloak:16.1.1"
KEYCLOAK_IMAGE="keycloak/keycloak:23.0.6-0"
KEYCLOAK_IMAGE="keycloak/keycloak:23.0.7"
KEYCLOAK_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.keycloak.service"
KEYCLOAK_HOSTNAME="${CLIENT_NAME}.keycloak"
KEYCLOAK_PORT=8080
Expand Down
8 changes: 8 additions & 0 deletions docker-compose/envoy/envoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ static_resources:
typed_config:
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
stat_prefix: grpc_json
access_log:
- name: envoy.access_loggers.stdout
typed_config:
"@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog
codec_type: AUTO
stream_idle_timeout: 900s
# common_http_protocol_options:
Expand Down Expand Up @@ -107,6 +111,10 @@ static_resources:
typed_config:
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
stat_prefix: grpc_json
access_log:
- name: envoy.access_loggers.stdout
typed_config:
"@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog
codec_type: AUTO
stream_idle_timeout: 900s
# common_http_protocol_options:
Expand Down

0 comments on commit 72b1199

Please sign in to comment.