From 247804240d2d72898d91c1e670f0d9c31008ee6a Mon Sep 17 00:00:00 2001 From: dqzboy Date: Sat, 29 Jun 2024 12:55:48 +0800 Subject: [PATCH] fix: Config file modified. --- LICENSE | 2 +- caddy/Caddyfile | 2 +- config/registry-elastic.yml | 1 + config/registry-mcr.yml | 1 + docker-compose.yaml | 4 +--- install/DockerProxy_Install.sh | 3 +-- nginx/registry-proxy.conf | 12 ------------ 7 files changed, 6 insertions(+), 19 deletions(-) diff --git a/LICENSE b/LICENSE index 58952d3..b68c8b1 100644 --- a/LICENSE +++ b/LICENSE @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SOFTWARE. \ No newline at end of file diff --git a/caddy/Caddyfile b/caddy/Caddyfile index f385503..4ecbf01 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -80,4 +80,4 @@ elastic.your_domain_name { header_up X-Forwarded-For {remote_addr} header_up X-Nginx-Proxy true } -} \ No newline at end of file +} diff --git a/config/registry-elastic.yml b/config/registry-elastic.yml index 8bec1d4..512aaa2 100644 --- a/config/registry-elastic.yml +++ b/config/registry-elastic.yml @@ -39,3 +39,4 @@ proxy: remoteurl: https://docker.elastic.co username: password: + ttl: \ No newline at end of file diff --git a/config/registry-mcr.yml b/config/registry-mcr.yml index 2a0b180..383fc84 100644 --- a/config/registry-mcr.yml +++ b/config/registry-mcr.yml @@ -39,3 +39,4 @@ proxy: remoteurl: https://mcr.microsoft.com username: password: + ttl: \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 5006b5c..e58c551 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,7 +16,6 @@ services: networks: - registry-net - ## ghcr.io ghcr: container_name: reg-ghcr @@ -136,7 +135,6 @@ services: networks: - registry-net - ## UI registry-ui: container_name: registry-ui @@ -155,4 +153,4 @@ services: - registry-net networks: - registry-net: + registry-net: \ No newline at end of file diff --git a/install/DockerProxy_Install.sh b/install/DockerProxy_Install.sh index c73a256..2ed3f29 100644 --- a/install/DockerProxy_Install.sh +++ b/install/DockerProxy_Install.sh @@ -66,7 +66,6 @@ maxAttempts=3 function CHECK_OS() { INFO "======================= 检查环境 =======================" -# OS version OSVER=$(cat /etc/os-release | grep -o '[0-9]' | head -n 1) if [ -f /etc/os-release ]; then @@ -139,7 +138,7 @@ function CHECKMEM() { memory_usage=$(free | awk '/^Mem:/ {printf "%.2f", $3/$2 * 100}') memory_usage=${memory_usage%.*} -if [[ $memory_usage -gt 90 ]]; then # 判断是否超过 90% +if [[ $memory_usage -gt 90 ]]; then read -e -p "$(WARN '内存占用率高于 70%($memory_usage%). 是否继续安装?: ')" continu if [ "$continu" == "n" ] || [ "$continu" == "N" ]; then exit 1 diff --git a/nginx/registry-proxy.conf b/nginx/registry-proxy.conf index 8a90e65..cb9c6c7 100644 --- a/nginx/registry-proxy.conf +++ b/nginx/registry-proxy.conf @@ -2,7 +2,6 @@ server { listen 80; listen 443 ssl; - ## 填写绑定证书的域名 server_name ui.your_domain_name; ## 证书文件名称（填写你证书存放的路径和名称） @@ -38,7 +37,6 @@ server { server { listen 80; listen 443 ssl; - ## 填写绑定证书的域名 server_name hub.your_domain_name; ## 证书文件名称（填写你证书存放的路径和名称） @@ -73,7 +71,6 @@ server { server { listen 80; listen 443 ssl; - ## 填写绑定证书的域名 server_name ghcr.your_domain_name; ## 证书文件名称（填写你证书存放的路径和名称） @@ -108,7 +105,6 @@ server { server { listen 80; listen 443 ssl; - ## 填写绑定证书的域名 server_name gcr.your_domain_name; ## 证书文件名称（填写你证书存放的路径和名称） @@ -142,7 +138,6 @@ server { server { listen 80; listen 443 ssl; - ## 填写绑定证书的域名 server_name k8s-gcr.your_domain_name; ## 证书文件名称（填写你证书存放的路径和名称） @@ -172,12 +167,10 @@ server { } } - ## Kubernetes's container image registry (registry.k8s.io) server { listen 80; listen 443 ssl; - ## 填写绑定证书的域名 server_name k8s.your_domain_name; ## 证书文件名称（填写你证书存放的路径和名称） @@ -211,7 +204,6 @@ server { server { listen 80; listen 443 ssl; - ## 填写绑定证书的域名 server_name quay.your_domain_name; ## 证书文件名称（填写你证书存放的路径和名称） @@ -241,12 +233,10 @@ server { } } - ## Microsoft Container (mcr.microsoft.com) server { listen 80; listen 443 ssl; - ## 填写绑定证书的域名 server_name mcr.your_domain_name; ## 证书文件名称（填写你证书存放的路径和名称） @@ -276,12 +266,10 @@ server { } } - ## docker.elastic.co server { listen 80; listen 443 ssl; - ## 填写绑定证书的域名 server_name elastic.your_domain_name; ## 证书文件名称（填写你证书存放的路径和名称）