Browse Source

fix: Config file modified.

dqzboy 1 year ago
parent
commit
247804240d

+ 1 - 1
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
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 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
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

+ 1 - 1
caddy/Caddyfile

@@ -80,4 +80,4 @@ elastic.your_domain_name {
         header_up X-Forwarded-For {remote_addr}
         header_up X-Forwarded-For {remote_addr}
         header_up X-Nginx-Proxy true
         header_up X-Nginx-Proxy true
     }
     }
-}
+}

+ 1 - 0
config/registry-elastic.yml

@@ -39,3 +39,4 @@ proxy:
   remoteurl: https://docker.elastic.co
   remoteurl: https://docker.elastic.co
   username: 
   username: 
   password:
   password:
+  ttl:

+ 1 - 0
config/registry-mcr.yml

@@ -39,3 +39,4 @@ proxy:
   remoteurl: https://mcr.microsoft.com
   remoteurl: https://mcr.microsoft.com
   username: 
   username: 
   password:
   password:
+  ttl:

+ 1 - 3
docker-compose.yaml

@@ -16,7 +16,6 @@ services:
     networks:
     networks:
       - registry-net
       - registry-net
 
 
-
   ## ghcr.io
   ## ghcr.io
   ghcr:
   ghcr:
     container_name: reg-ghcr
     container_name: reg-ghcr
@@ -136,7 +135,6 @@ services:
     networks:
     networks:
       - registry-net
       - registry-net
 
 
-
   ## UI
   ## UI
   registry-ui:
   registry-ui:
     container_name: registry-ui
     container_name: registry-ui
@@ -155,4 +153,4 @@ services:
       - registry-net
       - registry-net
 
 
 networks:
 networks:
-  registry-net:
+  registry-net:

+ 1 - 2
install/DockerProxy_Install.sh

@@ -66,7 +66,6 @@ maxAttempts=3
 
 
 function CHECK_OS() {
 function CHECK_OS() {
 INFO "======================= 检查环境 ======================="
 INFO "======================= 检查环境 ======================="
-# OS version
 OSVER=$(cat /etc/os-release | grep -o '[0-9]' | head -n 1)
 OSVER=$(cat /etc/os-release | grep -o '[0-9]' | head -n 1)
 
 
 if [ -f /etc/os-release ]; then
 if [ -f /etc/os-release ]; then
@@ -139,7 +138,7 @@ function CHECKMEM() {
 memory_usage=$(free | awk '/^Mem:/ {printf "%.2f", $3/$2 * 100}')
 memory_usage=$(free | awk '/^Mem:/ {printf "%.2f", $3/$2 * 100}')
 memory_usage=${memory_usage%.*}
 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
     read -e -p "$(WARN '内存占用率高于 70%($memory_usage%). 是否继续安装?: ')" continu
     if [ "$continu" == "n" ] || [ "$continu" == "N" ]; then
     if [ "$continu" == "n" ] || [ "$continu" == "N" ]; then
         exit 1
         exit 1

+ 0 - 12
nginx/registry-proxy.conf

@@ -2,7 +2,6 @@
 server {
 server {
     listen       80;
     listen       80;
     listen       443 ssl;
     listen       443 ssl;
-
     ## 填写绑定证书的域名
     ## 填写绑定证书的域名
     server_name  ui.your_domain_name;
     server_name  ui.your_domain_name;
     ## 证书文件名称(填写你证书存放的路径和名称)
     ## 证书文件名称(填写你证书存放的路径和名称)
@@ -38,7 +37,6 @@ server {
 server {
 server {
     listen       80;
     listen       80;
     listen       443 ssl;
     listen       443 ssl;
-
     ## 填写绑定证书的域名
     ## 填写绑定证书的域名
     server_name  hub.your_domain_name;
     server_name  hub.your_domain_name;
     ## 证书文件名称(填写你证书存放的路径和名称)
     ## 证书文件名称(填写你证书存放的路径和名称)
@@ -73,7 +71,6 @@ server {
 server {
 server {
     listen       80;
     listen       80;
     listen       443 ssl;
     listen       443 ssl;
-
     ## 填写绑定证书的域名
     ## 填写绑定证书的域名
     server_name  ghcr.your_domain_name;
     server_name  ghcr.your_domain_name;
     ## 证书文件名称(填写你证书存放的路径和名称)
     ## 证书文件名称(填写你证书存放的路径和名称)
@@ -108,7 +105,6 @@ server {
 server {
 server {
     listen       80;
     listen       80;
     listen       443 ssl;
     listen       443 ssl;
-
     ## 填写绑定证书的域名
     ## 填写绑定证书的域名
     server_name  gcr.your_domain_name;
     server_name  gcr.your_domain_name;
     ## 证书文件名称(填写你证书存放的路径和名称)
     ## 证书文件名称(填写你证书存放的路径和名称)
@@ -142,7 +138,6 @@ server {
 server {
 server {
     listen       80;
     listen       80;
     listen       443 ssl;
     listen       443 ssl;
-
     ## 填写绑定证书的域名
     ## 填写绑定证书的域名
     server_name  k8s-gcr.your_domain_name;
     server_name  k8s-gcr.your_domain_name;
     ## 证书文件名称(填写你证书存放的路径和名称)
     ## 证书文件名称(填写你证书存放的路径和名称)
@@ -172,12 +167,10 @@ server {
     }
     }
 }
 }
 
 
-
 ## Kubernetes's container image registry (registry.k8s.io)
 ## Kubernetes's container image registry (registry.k8s.io)
 server {
 server {
     listen       80;
     listen       80;
     listen       443 ssl;
     listen       443 ssl;
-
     ## 填写绑定证书的域名
     ## 填写绑定证书的域名
     server_name  k8s.your_domain_name;
     server_name  k8s.your_domain_name;
     ## 证书文件名称(填写你证书存放的路径和名称)
     ## 证书文件名称(填写你证书存放的路径和名称)
@@ -211,7 +204,6 @@ server {
 server {
 server {
     listen       80;
     listen       80;
     listen       443 ssl;
     listen       443 ssl;
-
     ## 填写绑定证书的域名
     ## 填写绑定证书的域名
     server_name  quay.your_domain_name;
     server_name  quay.your_domain_name;
     ## 证书文件名称(填写你证书存放的路径和名称)
     ## 证书文件名称(填写你证书存放的路径和名称)
@@ -241,12 +233,10 @@ server {
     }
     }
 }
 }
 
 
-
 ## Microsoft Container (mcr.microsoft.com)
 ## Microsoft Container (mcr.microsoft.com)
 server {
 server {
     listen       80;
     listen       80;
     listen       443 ssl;
     listen       443 ssl;
-
     ## 填写绑定证书的域名
     ## 填写绑定证书的域名
     server_name  mcr.your_domain_name;
     server_name  mcr.your_domain_name;
     ## 证书文件名称(填写你证书存放的路径和名称)
     ## 证书文件名称(填写你证书存放的路径和名称)
@@ -276,12 +266,10 @@ server {
     }
     }
 }
 }
 
 
-
 ## docker.elastic.co
 ## docker.elastic.co
 server {
 server {
     listen       80;
     listen       80;
     listen       443 ssl;
     listen       443 ssl;
-
     ## 填写绑定证书的域名
     ## 填写绑定证书的域名
     server_name  elastic.your_domain_name;
     server_name  elastic.your_domain_name;
     ## 证书文件名称(填写你证书存放的路径和名称)
     ## 证书文件名称(填写你证书存放的路径和名称)