diff --git a/Deploy/kubernetes/dockerfiles/config/registry/root.crt b/Deploy/kubernetes/dockerfiles/config/registry/root.crt deleted file mode 100644 index 326d8080a..000000000 --- a/Deploy/kubernetes/dockerfiles/config/registry/root.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAcGgAwIBAgIJAN1nLuloDeHNMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQwHhcNMTYwMTI3MDQyMDM1WhcNNDMwNjE0MDQyMDM1WjBF -MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 -ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB -gQClak/4HO7EeLU0w/BhtVENPLOqU0AP2QjVUdg1qhNiDWVrbWx9KYHqz5Kn0n2+ -fxdZo3o7ZY5/2+hhgkKh1z6Kge9XGgune6z4fx2J/X2Se8WsGeQUTiND8ngSnsCA -NtYFwW50SbUZPtyf5XjAfKRofZem51OxbxzN3217L/ubKwIDAQABo1AwTjAdBgNV -HQ4EFgQU5EG2VrB3I6G/TudUpz+kBgQXSvYwHwYDVR0jBBgwFoAU5EG2VrB3I6G/ -TudUpz+kBgQXSvYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAx+2eo -oOm0YNy9KQ81+7GQkKVWoPQXjAGGgZuZj8WCFepYqUSJ4q5qbuVCY8WbGcHVk2Rx -Jg1XDCmMjBgYP6S0ikezBRqSmNA3G6oFiydTKBfPs6RNalsB0C78Xk5l5+PIyd2R -jFKOKoMpkjwfeJv2j64WNGoBgqj7XRBoJ11a4g== ------END CERTIFICATE----- diff --git a/Deploy/kubernetes/dockerfiles/config/ui/app.conf b/Deploy/kubernetes/dockerfiles/config/ui/app.conf deleted file mode 100644 index 5465292d2..000000000 --- a/Deploy/kubernetes/dockerfiles/config/ui/app.conf +++ /dev/null @@ -1,16 +0,0 @@ -appname = registry -runmode = dev - -[lang] -types = en-US|zh-CN -names = en-US|zh-CN - -[dev] -httpport = 80 - -[mail] -host = smtp.mydomain.com -port = 25 -username = sample_admin@mydomain.com -password = abc -from = admin diff --git a/Deploy/kubernetes/dockerfiles/config/ui/env b/Deploy/kubernetes/dockerfiles/config/ui/env deleted file mode 100644 index aba7fedd3..000000000 --- a/Deploy/kubernetes/dockerfiles/config/ui/env +++ /dev/null @@ -1,11 +0,0 @@ -MYSQL_HOST=mysql -MYSQL_USR=root -REGISTRY_URL=http://registry:5000 -CONFIG_PATH=/etc/ui/app.conf -HARBOR_REG_URL=proxy -HARBOR_ADMIN_PASSWORD=Harbor12345 -HARBOR_URL=ui -AUTH_MODE=db_auth -LDAP_URL=ldaps://ldap.mydomain.com -LDAP_BASE_DN=uid=%s,ou=people,dc=mydomain,dc=com -LOG_LEVEL=debug diff --git a/Deploy/kubernetes/dockerfiles/config/ui/private_key.pem b/Deploy/kubernetes/dockerfiles/config/ui/private_key.pem deleted file mode 100644 index 6c68cacb3..000000000 --- a/Deploy/kubernetes/dockerfiles/config/ui/private_key.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQClak/4HO7EeLU0w/BhtVENPLOqU0AP2QjVUdg1qhNiDWVrbWx9 -KYHqz5Kn0n2+fxdZo3o7ZY5/2+hhgkKh1z6Kge9XGgune6z4fx2J/X2Se8WsGeQU -TiND8ngSnsCANtYFwW50SbUZPtyf5XjAfKRofZem51OxbxzN3217L/ubKwIDAQAB -AoGBAITMMuNYJwAogCGaZHOs4yMjZoIJT9bpQMQxbsi2f9UqOA/ky0I4foqKloyQ -2k6DLbXTHqBsydgwLgGKWAAiE5xIR2bPMUNSLgjbA2eLly3aOR/0FJ5n09k2EmGg -Am7tLP+6yneXWKVi3HI3NzXriVjWK94WHGGC1b9F+n5CY/2RAkEA1d62OJUNve2k -IY6/b6T0BdssFo3VFcm22vnayEL/wcYrnRfF9Pb5wM4HUUqwVelKTouivXg60GNK -ZKYAx5CtHwJBAMYAEf5u0CQ/8URcwBuMkm0LzK4AM2x1nGs7gIxAEFhu1Z4xPjVe -MtIxuHhDhlLvD760uccmo5yE72QJ1ZrYBHUCQQCAxLZMPRpoB4QyHEOREe1G9V6H -OeBZXPk2wQcEWqqo3gt2a1DqHCXl+2aWgHTJVUxDHHngwFoRDCdHkFeZ0LcbAkAj -T8/luI2WaXD16DS6tQ9IM1qFjbOeHDuRRENgv+wqWVnvpIibq/kUU5m6mRBTqh78 -u+6F/fYf6/VluftGalAhAkAukdMtt+sksq2e7Qw2dRr5GXtXjt+Otjj0NaJENmWk -a7SgAs34EOWtbd0XGYpZFrg134MzQGbweFeEUTj++e8p ------END RSA PRIVATE KEY----- diff --git a/Deploy/kubernetes/dockerfiles/proxy-dockerfile b/Deploy/kubernetes/dockerfiles/proxy-dockerfile index f724ac148..fbc967233 100644 --- a/Deploy/kubernetes/dockerfiles/proxy-dockerfile +++ b/Deploy/kubernetes/dockerfiles/proxy-dockerfile @@ -1,5 +1,3 @@ FROM library/nginx:1.9 ADD ./config/nginx /etc/nginx - - diff --git a/Deploy/kubernetes/dockerfiles/config/registry/config.yml b/Deploy/kubernetes/dockerfiles/registry-config.yml similarity index 100% rename from Deploy/kubernetes/dockerfiles/config/registry/config.yml rename to Deploy/kubernetes/dockerfiles/registry-config.yml diff --git a/Deploy/kubernetes/dockerfiles/registry-dockerfile b/Deploy/kubernetes/dockerfiles/registry-dockerfile index 3921087c0..9fb39c5c4 100644 --- a/Deploy/kubernetes/dockerfiles/registry-dockerfile +++ b/Deploy/kubernetes/dockerfiles/registry-dockerfile @@ -1,6 +1,6 @@ FROM library/registry:2.3.0 -ADD ./kubernetes/dockerfiles/config/registry/ /etc/registry/ +ADD ./config/registry/ /etc/registry/ +ADD ./kubernetes/dockerfiles/registry-config.yml /etc/registry/config.yml CMD ["/etc/registry/config.yml"] - diff --git a/Deploy/kubernetes/dockerfiles/ui-dockerfile b/Deploy/kubernetes/dockerfiles/ui-dockerfile index df7f74fb3..c9714139c 100644 --- a/Deploy/kubernetes/dockerfiles/ui-dockerfile +++ b/Deploy/kubernetes/dockerfiles/ui-dockerfile @@ -1,7 +1,4 @@ FROM deploy_ui -ADD ./kubernetes/dockerfiles/config/ui/app.conf /etc/ui/app.conf -ADD ./kubernetes/dockerfiles/config/ui/private_key.pem /etc/ui/private_key.pem - - - +ADD ./config/ui/app.conf /etc/ui/app.conf +ADD ./config/ui/private_key.pem /etc/ui/private_key.pem