From aee77bcc9c141915ae885c8a0218460063de35ae Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Thu, 25 Jul 2024 14:40:18 +0800
Subject: [PATCH] 2.1.10 rc

---
 changelog_latest.md           | 11 +++++++++--
 docker/.env                   |  4 ++--
 docker/apphub/Dockerfile      |  2 +-
 docker/docker-compose-dev.yml |  6 +-----
 version.json                  |  4 ++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/changelog_latest.md b/changelog_latest.md
index c6293c27..85c48e42 100644
--- a/changelog_latest.md
+++ b/changelog_latest.md
@@ -1,3 +1,10 @@
 ### enhancement:
-- help wanted at Websoft9 console #507
-- Configure Docker image acceleration #502
\ No newline at end of file
+- websoft9-proxy container delete， cannot work #510
+- websoft9 service can not send credentials to Nginx or portainer reset  #505
+
+### appstore:
+- [nextcloud edit office document failed when use domain](https://github.com/Websoft9/docker-library/issues/646)
+- [can not pull image for [knowage]](https://github.com/Websoft9/docker-library/issues/644)
+- [cannot connect db for gitea](https://github.com/Websoft9/docker-library/issues/642)
+- [complete docker-compose.yml for [Kaspersky]](https://github.com/Websoft9/docker-library/issues/640)
+- [complete docker-compose.yml for [Trivy]](https://github.com/Websoft9/docker-library/issues/639)
\ No newline at end of file
diff --git a/docker/.env b/docker/.env
index 15fd0d85..eedd25aa 100644
--- a/docker/.env
+++ b/docker/.env
@@ -1,4 +1,4 @@
 APPHUB_VERSION=0.1.1
-DEPLOYMENT_VERSION=2.20.1
+DEPLOYMENT_VERSION=2.20.3
 GIT_VERSION=1.21.9
-PROXY_VERSION=2.11.1
\ No newline at end of file
+PROXY_VERSION=2.11.3
\ No newline at end of file
diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile
index ee38cd9f..ed41ecb5 100644
--- a/docker/apphub/Dockerfile
+++ b/docker/apphub/Dockerfile
@@ -1,6 +1,6 @@
 # This file can running at actions
 # MEDIA_VERSION and LIBRARY_VERSION will trigger its release
-# modify time: 202407241614, you can modify here to trigger Docker Build action
+# modify time: 202407251440, you can modify here to trigger Docker Build action
 
 
 FROM python:3.10-slim-bullseye
diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml
index 1f40c523..c9083a92 100644
--- a/docker/docker-compose-dev.yml
+++ b/docker/docker-compose-dev.yml
@@ -37,11 +37,7 @@ services:
       - /data/compose:/data/compose
       - /var/run/docker.sock:/var/run/docker.sock
       #- /run/podman/podman.sock:/var/run/docker.sock
-    healthcheck:
-      test: ["CMD", "/endpoint"]
-      interval: 10s
-      timeout: 30s
-      retries: 4
+    command: ["--hide-label", "owner=websoft9"]
     labels:
       - "owner=websoft9"
       - "com.docker.compose.w9_http.port=9000"
diff --git a/version.json b/version.json
index 8e4003ff..90a31f8e 100644
--- a/version.json
+++ b/version.json
@@ -1,12 +1,12 @@
 {
-  "version": "2.1.9",
+  "version": "2.1.10-rc1",
   "plugins": {
     "portainer": "0.1.1",
     "nginx": "0.0.8",
     "gitea": "0.0.6",
     "myapps": "0.2.2",
     "appstore": "0.2.0",
-    "settings": "0.1.1",
+    "settings": "0.1.2",
     "navigator": "0.5.10"
   },
   "OS": {