diff --git a/Dockerfile-ee b/Dockerfile-ee index 0460dc1..26faf8f 100644 --- a/Dockerfile-ee +++ b/Dockerfile-ee @@ -1,5 +1,5 @@ ARG VERSION=dev -FROM jumpserver/web-static:20241121_062038 AS static +FROM jumpserver/web-static:20241205_072951 AS static FROM jumpserver/web:${VERSION}-ce COPY --from=static /opt/ /opt/ diff --git a/includes/facelive.conf b/includes/facelive.conf.disabled similarity index 100% rename from includes/facelive.conf rename to includes/facelive.conf.disabled diff --git a/init.sh b/init.sh index 5b79b4b..77fb2d5 100755 --- a/init.sh +++ b/init.sh @@ -141,6 +141,10 @@ function config_components() { if [[ "${USE_XPACK}" == "1" && "${RAZOR_ENABLED}" != "0" ]]; then safe_move /etc/nginx/includes/razor.conf.disabled /etc/nginx/includes/razor.conf fi + + if [[ "${USE_XPACK}" == "1" && "${FACELIVE_ENABLED}" == "1" ]]; then + safe_move /etc/nginx/includes/facelive.conf.disabled /etc/nginx/includes/facelive.conf + fi } function copy_versions_to_core() { @@ -149,6 +153,12 @@ function copy_versions_to_core() { fi } +function config_gzip() { + if [[ "${GZIP}" == "off" ]]; then + sed -i "s@gzip .*;@gzip ${GZIP};@g" /etc/nginx/nginx.conf + fi +} + function main() { if [ -f "/etc/nginx/sites-enabled/jms.conf" ]; then config_helm @@ -167,6 +177,7 @@ function main() { fi copy_versions_to_core + config_gzip } main diff --git a/versions.txt b/versions.txt index 30071b2..dbec597 100644 --- a/versions.txt +++ b/versions.txt @@ -2,7 +2,7 @@ # 1. https://github.com/jumpserver/jumpserver/blob/dev/apps/jumpserver/views/other.py#L99 # 2. https://github.com/jumpserver/jumpserver/blob/dev/apps/terminal/automations/deploy_applet_host/playbook.yml#L18 PLAY_VERSION=1.1.0-1 -PYTHON_VERSION=3.11.10 +PYTHON_VERSION=3.11.11 CHROME_VERSION=118.0.5993.118 CHROME_DRIVER_VERSION=118.0.5993.70 DBEAVER_VERSION=22.3.4 @@ -11,4 +11,4 @@ OPENSSH_VERSION=v9.4.0.0 MONGOSH_VERSION=2.2.12 TINKER_VERSION=v0.2.0 VIDEO_PLAYER_VERSION=0.2.0 -CLIENT_VERSION=v2.1.3 +CLIENT_VERSION=v3.0.0