beenull/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rc

Browse source
This commit is contained in:
qiaofeng1227 2023-11-03 16:07:14 +08:00
parent 88d5abdf66
commit 74f47939b5
5 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
1. improve dockerfile to reduce image size 1. improve dockerfile to reduce image size
2. fixed update_zip.sh 2. fixed update_zip.sh
3. hide websoft9 containers
## 0.8.27 release on 2023-10-31 ## 0.8.27 release on 2023-10-31

3
changelog_latest.md
View file

@ -1,2 +1 @@
1. improve dockerfile to reduce image size 1. hide websoft9 containers
2. fixed update_zip.sh

16
docker/docker-compose-dev.yml
View file

@ -22,6 +22,9 @@ services:
- deployment - deployment
- git - git
- proxy - proxy
labels:
- "owner=websoft9"
- "com.docker.compose.w9_http.port:8080"
deployment: deployment:
image: websoft9dev/deployment:$DEPLOYMENT_VERSION image: websoft9dev/deployment:$DEPLOYMENT_VERSION
@ -40,7 +43,8 @@ services:
timeout: 30s timeout: 30s
retries: 4 retries: 4
labels: labels:
com.docker.compose.w9_http.port: 9000 - "owner=websoft9"
- "com.docker.compose.w9_http.port:9000"
git: git:
image: websoft9dev/git:$GIT_VERSION image: websoft9dev/git:$GIT_VERSION
@ -61,7 +65,8 @@ services:
- REQUIRE_SIGNIN_VIEW=false - REQUIRE_SIGNIN_VIEW=false
- ROOT_URL=http://localhost/w9git/ - ROOT_URL=http://localhost/w9git/
labels: labels:
com.docker.compose.w9_http.port: 3000 - "owner=websoft9"
- "com.docker.compose.w9_http.port:3000"
proxy: proxy:
image: websoft9dev/proxy:$PROXY_VERSION image: websoft9dev/proxy:$PROXY_VERSION
@ -75,9 +80,10 @@ services:
- nginx_data:/data - nginx_data:/data
- nginx_letsencrypt:/etc/letsencrypt - nginx_letsencrypt:/etc/letsencrypt
labels: labels:
com.docker.compose.w9_http.port: 80 - "owner=websoft9"
com.docker.compose.w9_https.port: 443 - "com.docker.compose.w9_http.port: 80"
com.docker.compose.w9_console.port: 81 - "com.docker.compose.w9_https.port: 443"
- "com.docker.compose.w9_console.port: 81"
networks: networks:
default: default:

16
docker/docker-compose.yml
View file

@ -13,7 +13,8 @@ services:
- git - git
- proxy - proxy
labels: labels:
com.docker.compose.w9_http.port: 8080 - "owner=websoft9"
- "com.docker.compose.w9_http.port:8080"
deployment: deployment:
image: websoft9dev/deployment:$DEPLOYMENT_VERSION image: websoft9dev/deployment:$DEPLOYMENT_VERSION
@ -30,7 +31,8 @@ services:
timeout: 30s timeout: 30s
retries: 4 retries: 4
labels: labels:
com.docker.compose.w9_http.port: 9000 - "owner=websoft9"
- "com.docker.compose.w9_http.port:9000"
git: git:
image: websoft9dev/git:$GIT_VERSION image: websoft9dev/git:$GIT_VERSION
@ -49,7 +51,8 @@ services:
- REQUIRE_SIGNIN_VIEW=false - REQUIRE_SIGNIN_VIEW=false
- ROOT_URL=http://localhost/w9git/ - ROOT_URL=http://localhost/w9git/
labels: labels:
com.docker.compose.w9_http.port: 3000 - "owner=websoft9"
- "com.docker.compose.w9_http.port:3000"
proxy: proxy:
image: websoft9dev/proxy:$PROXY_VERSION image: websoft9dev/proxy:$PROXY_VERSION
@ -62,9 +65,10 @@ services:
- nginx_data:/data - nginx_data:/data
- nginx_letsencrypt:/etc/letsencrypt - nginx_letsencrypt:/etc/letsencrypt
labels: labels:
com.docker.compose.w9_http.port: 80 - "owner=websoft9"
com.docker.compose.w9_https.port: 443 - "com.docker.compose.w9_http.port: 80"
com.docker.compose.w9_console.port: 81 - "com.docker.compose.w9_https.port: 443"
- "com.docker.compose.w9_console.port: 81"
networks: networks:
default: default:

2
version.json
View file

@ -1,5 +1,5 @@
{ {
"version": "0.8.28-rc3", "version": "0.8.28-rc4",
"plugins": { "plugins": {
"portainer": "0.0.7", "portainer": "0.0.7",
"nginx": "0.0.5", "nginx": "0.0.5",