diff --git a/CHANGELOG.md b/CHANGELOG.md index 582b8f7d..be666382 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ 1. improve dockerfile to reduce image size 2. fixed update_zip.sh +3. hide websoft9 containers ## 0.8.27 release on 2023-10-31 diff --git a/changelog_latest.md b/changelog_latest.md index 4cfc6e52..01267722 100644 --- a/changelog_latest.md +++ b/changelog_latest.md @@ -1,2 +1 @@ -1. improve dockerfile to reduce image size -2. fixed update_zip.sh +1. hide websoft9 containers diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml index f691ac22..a23b2625 100644 --- a/docker/docker-compose-dev.yml +++ b/docker/docker-compose-dev.yml @@ -22,6 +22,9 @@ services: - deployment - git - proxy + labels: + - "owner=websoft9" + - "com.docker.compose.w9_http.port:8080" deployment: image: websoft9dev/deployment:$DEPLOYMENT_VERSION @@ -40,7 +43,8 @@ services: timeout: 30s retries: 4 labels: - com.docker.compose.w9_http.port: 9000 + - "owner=websoft9" + - "com.docker.compose.w9_http.port:9000" git: image: websoft9dev/git:$GIT_VERSION @@ -61,7 +65,8 @@ services: - REQUIRE_SIGNIN_VIEW=false - ROOT_URL=http://localhost/w9git/ labels: - com.docker.compose.w9_http.port: 3000 + - "owner=websoft9" + - "com.docker.compose.w9_http.port:3000" proxy: image: websoft9dev/proxy:$PROXY_VERSION @@ -75,9 +80,10 @@ services: - nginx_data:/data - nginx_letsencrypt:/etc/letsencrypt labels: - com.docker.compose.w9_http.port: 80 - com.docker.compose.w9_https.port: 443 - com.docker.compose.w9_console.port: 81 + - "owner=websoft9" + - "com.docker.compose.w9_http.port: 80" + - "com.docker.compose.w9_https.port: 443" + - "com.docker.compose.w9_console.port: 81" networks: default: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 000f0ae3..c00d1729 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,7 +13,8 @@ services: - git - proxy labels: - com.docker.compose.w9_http.port: 8080 + - "owner=websoft9" + - "com.docker.compose.w9_http.port:8080" deployment: image: websoft9dev/deployment:$DEPLOYMENT_VERSION @@ -30,7 +31,8 @@ services: timeout: 30s retries: 4 labels: - com.docker.compose.w9_http.port: 9000 + - "owner=websoft9" + - "com.docker.compose.w9_http.port:9000" git: image: websoft9dev/git:$GIT_VERSION @@ -49,7 +51,8 @@ services: - REQUIRE_SIGNIN_VIEW=false - ROOT_URL=http://localhost/w9git/ labels: - com.docker.compose.w9_http.port: 3000 + - "owner=websoft9" + - "com.docker.compose.w9_http.port:3000" proxy: image: websoft9dev/proxy:$PROXY_VERSION @@ -62,9 +65,10 @@ services: - nginx_data:/data - nginx_letsencrypt:/etc/letsencrypt labels: - com.docker.compose.w9_http.port: 80 - com.docker.compose.w9_https.port: 443 - com.docker.compose.w9_console.port: 81 + - "owner=websoft9" + - "com.docker.compose.w9_http.port: 80" + - "com.docker.compose.w9_https.port: 443" + - "com.docker.compose.w9_console.port: 81" networks: default: diff --git a/version.json b/version.json index b3c8ba6e..3343945b 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "0.8.28-rc3", + "version": "0.8.28-rc4", "plugins": { "portainer": "0.0.7", "nginx": "0.0.5",