From cce93eb8af006c2d0ba736a53a04d5f3af7610ab Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Thu, 23 May 2024 07:17:09 +0800 Subject: [PATCH 1/7] Update Dockerfile --- docker/apphub/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index 29f934ba..e6ce5b11 100644 --- a/docker/apphub/Dockerfile +++ b/docker/apphub/Dockerfile @@ -1,11 +1,11 @@ # This file can running at actions # MEDIA_VERSION and LIBRARY_VERSION will trigger its release -# modify time: 202405111515, you can modify here to trigger Docker Build action +# modify time: 202405230715, you can modify here to trigger Docker Build action FROM python:3.10-slim-bullseye LABEL maintainer="Websoft9" -LABEL version="0.0.9" +LABEL version="0.1.0" WORKDIR /websoft9 From ee6e3bf907a490a587bb2a807e194bf64837814b Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Fri, 24 May 2024 07:23:11 +0800 Subject: [PATCH 2/7] rc release 2.1.5 --- changelog_latest.md | 14 +++++++------- docker/.env | 2 +- version.json | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/changelog_latest.md b/changelog_latest.md index 35071070..8d8419ca 100644 --- a/changelog_latest.md +++ b/changelog_latest.md @@ -1,10 +1,10 @@ ### enhancement: -- show message is not friendly #482 -- change 80 port to 9000 port for Websoft9 console, 80 only for application #481 -- favorite app #478 +- some application root_url need set as url:port #483 +- Doc url in the app store and myapps should be updated to the next version #484 +- add a WeChat communication group to share via QR code #486 +- nextcloud set https at private cloud, access always waiting #492 ### appstore: -- [cpu and memory limit at docker-compose](https://github.com/Websoft9/docker-library/issues/572) -- [complete the install for [bigbluebutton]](https://github.com/Websoft9/docker-library/issues/330) -- [complete docker compose for [jitsi]](https://github.com/Websoft9/docker-library/issues/332) -- [complete docker compose for [Apache Airflow]](https://github.com/Websoft9/docker-library/issues/340) \ No newline at end of file +- [complete docker-compose.yml for [semaphore]](https://github.com/Websoft9/docker-library/issues/610) +- [joomla port error](https://github.com/Websoft9/docker-library/issues/611) +- [Discourse run failed](https://github.com/Websoft9/docker-library/issues/615) \ No newline at end of file diff --git a/docker/.env b/docker/.env index 68e26197..9ac676d8 100644 --- a/docker/.env +++ b/docker/.env @@ -1,4 +1,4 @@ -APPHUB_VERSION=0.0.9 +APPHUB_VERSION=0.1.0 DEPLOYMENT_VERSION=2.20.1 GIT_VERSION=1.21.9 PROXY_VERSION=2.11.1 \ No newline at end of file diff --git a/version.json b/version.json index 54b56a50..6a490872 100644 --- a/version.json +++ b/version.json @@ -1,11 +1,11 @@ { - "version": "2.1.4", + "version": "2.1.5-rc1", "plugins": { "portainer": "0.1.1", "nginx": "0.0.8", "gitea": "0.0.6", - "myapps": "0.1.9", - "appstore": "0.1.7", + "myapps": "0.2.0", + "appstore": "0.1.8", "settings": "0.1.0", "navigator": "0.5.10" }, From 0192bee2338df6788dd11c881a394e8fff1a42ed Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Fri, 24 May 2024 16:14:17 +0800 Subject: [PATCH 3/7] release 2.1.5 --- docker/apphub/Dockerfile | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index e6ce5b11..8f9a1cde 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: 202405230715, you can modify here to trigger Docker Build action +# modify time: 202405241615, you can modify here to trigger Docker Build action FROM python:3.10-slim-bullseye diff --git a/version.json b/version.json index 6a490872..c6b2169a 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "2.1.5-rc1", + "version": "2.1.5", "plugins": { "portainer": "0.1.1", "nginx": "0.0.8", From 4b97cd40c4817af84b9798532940804791b28c81 Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Tue, 28 May 2024 16:45:05 +0800 Subject: [PATCH 4/7] apphub --- apphub/src/config/config.ini | 2 +- docker/apphub/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apphub/src/config/config.ini b/apphub/src/config/config.ini index 5a7d26a4..732ccd3f 100755 --- a/apphub/src/config/config.ini +++ b/apphub/src/config/config.ini @@ -29,5 +29,5 @@ port = 9000 keys = [favorite_apps] -keys = kibana +keys = diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index 8f9a1cde..3af1054f 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: 202405241615, you can modify here to trigger Docker Build action +# modify time: 202405281644, you can modify here to trigger Docker Build action FROM python:3.10-slim-bullseye From da8a756841c83ba1b8ed3baa0f6c8c80b0124c97 Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Wed, 29 May 2024 12:10:28 +0800 Subject: [PATCH 5/7] Update config.ini --- apphub/src/config/config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apphub/src/config/config.ini b/apphub/src/config/config.ini index 732ccd3f..91151cc1 100755 --- a/apphub/src/config/config.ini +++ b/apphub/src/config/config.ini @@ -20,7 +20,7 @@ user_pwd = L@BI75LJ7Shi7oLA key = bd3d92e0f52e299d014c38f8aac7f730602a8a7a41adbee77eddf07b391b9d31 [domain] -wildcard_domain = test.websoft9.cn +wildcard_domain = [cockpit] port = 9000 From e89a8a9b710b5bfba3b3d7c26ae3b1e3f2e89668 Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Wed, 29 May 2024 12:11:59 +0800 Subject: [PATCH 6/7] Update Dockerfile --- docker/apphub/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index 3af1054f..7a15020d 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: 202405281644, you can modify here to trigger Docker Build action +# modify time: 202405291214, you can modify here to trigger Docker Build action FROM python:3.10-slim-bullseye From 7f047e33815c61cdf2945e8e1cf2bff158e85447 Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Thu, 30 May 2024 07:09:55 +0800 Subject: [PATCH 7/7] Update Dockerfile --- docker/apphub/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index 7a15020d..3faa82c7 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: 202405291214, you can modify here to trigger Docker Build action +# modify time: 202405300714, you can modify here to trigger Docker Build action FROM python:3.10-slim-bullseye