diff --git a/docker/Dockerfile b/docker/prod/Dockerfile similarity index 81% rename from docker/Dockerfile rename to docker/prod/Dockerfile index 14445b4..d5fc033 100644 --- a/docker/Dockerfile +++ b/docker/prod/Dockerfile @@ -5,7 +5,7 @@ COPY ./secret /secret RUN rm /etc/nginx/conf.d/default.conf -ARG ENV_VAR=default_production.conf +ARG ENV_VAR=default.conf ADD ${ENV_VAR} /etc/nginx/conf.d/ diff --git a/docker/default_production.conf b/docker/prod/default.conf similarity index 100% rename from docker/default_production.conf rename to docker/prod/default.conf diff --git a/docker/prod/docker-compose.yaml b/docker/prod/docker-compose.yaml new file mode 100644 index 0000000..c15a91a --- /dev/null +++ b/docker/prod/docker-compose.yaml @@ -0,0 +1,16 @@ +# PROJECT: 康来生物有限公司kicc(智慧冷链)分布式架构平台 +# VERSION: 1.0.0 +# Author: 康来生物科技有限公司-王翔 + +version: '3' +services: + kicc-ui: + build: + context: . + restart: always + container_name: kicc-ui + image: kicc-ui + network_mode: 'host' + ports: + - 80:80 + - 443:443 diff --git a/docker/secret/ssl.key b/docker/prod/secret/ssl.key similarity index 100% rename from docker/secret/ssl.key rename to docker/prod/secret/ssl.key diff --git a/docker/secret/ssl.pem b/docker/prod/secret/ssl.pem similarity index 100% rename from docker/secret/ssl.pem rename to docker/prod/secret/ssl.pem diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile new file mode 100644 index 0000000..d5fc033 --- /dev/null +++ b/docker/test/Dockerfile @@ -0,0 +1,12 @@ +FROM nginx + +COPY ./dist /data +COPY ./secret /secret + +RUN rm /etc/nginx/conf.d/default.conf + +ARG ENV_VAR=default.conf + +ADD ${ENV_VAR} /etc/nginx/conf.d/ + +RUN /bin/bash -c 'echo init ok' diff --git a/docker/default_development.conf b/docker/test/default.conf similarity index 100% rename from docker/default_development.conf rename to docker/test/default.conf diff --git a/docker/docker-compose.yaml b/docker/test/docker-compose.yaml similarity index 57% rename from docker/docker-compose.yaml rename to docker/test/docker-compose.yaml index 070ef43..daa05ed 100644 --- a/docker/docker-compose.yaml +++ b/docker/test/docker-compose.yaml @@ -4,27 +4,17 @@ version: '3' services: - kicc-ui-dev: + kicc-ui: build: context: . restart: always - container_name: kicc-ui-dev - image: kicc-ui-dev + container_name: kicc-ui + image: kicc-ui networks: - docker-cloud_default ports: - 80:80 - 443:443 - kicc-ui-prod: - build: - context: . - restart: always - container_name: kicc-ui-prod - image: kicc-ui-prod - network_mode: 'host' - ports: - - 80:80 - - 443:443 networks: docker-cloud_default: diff --git a/docker/test/secret/ssl.key b/docker/test/secret/ssl.key new file mode 100644 index 0000000..6626e79 --- /dev/null +++ b/docker/test/secret/ssl.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAv4FqBfyUlNxtsL1Rv2ybsRPGRpPgUs8kXEQEacxk4zj98z53 +NBO6v547pxZCZQpX0V2g8tel9LSalJfzeU5lFmUWo8fIb/KJL3XIAtE6JDCne+2M +sgliRyUFizwoQhyjiDoBU38Dh4jPzuldynsrqtkwdoV+mi6vreOYTTvq7mXTJPvO +V2MKbpcPrO4JMTUr5gIiEIWIddnnrlQUCBZtpei6AYxz9LfTdzNC0L+LeUNLQK0y +KWPEzPbyh90XTgBKGx5d5NDwvgK2fVKOUeKyDuMS5pflzlBrez/tsSIJlMycf+Ol +usUgdVpD+ionmwleEbFIX19kwPxJdOhKLKN/owIDAQABAoIBAB3MT8iFsELnd6Pw +GWe9SQ6JIql5ugZ4l9JJfRxPQwV+KTmvpxGx3jWRs/uAQa2CKf74YCJZPsfwUDs9 +15MxCRaufRLX887DgOgjHg+eKbtW3MCySlmrjyC92Hp9TlBXL3TzfaBV26E7vwYV +ltP6TWWkrN9MT1JDYG+gweKGp7wXVAG9JmQVJDaW7ikh8rzRDxFV4ssLboyab7y+ +AyXKzG3iVDYZQLgHMK/4iuuw5GB5fAIbjSCBRwUdqWsJHTGLD/7iEjdS98Q6eR5R ++4FUoxuJSKgIUr6dEVo4DuJhnGwtNKseKZztKovkO35mEr+WoEkP+TfGh0CEfNAl +cgMaDJkCgYEA6JOEt2lE4tEP3DRgWRE9ml6axteIZH4t6O4BWibiQjZpV/U9M9Km +/qfIF1x4Qs6x+7V49WdpnWJwEj9qgCfJgIlpkFHnt9wDpv46kvnFPHxi2k+NMiHH +rITyRD2zcXarX/mPmso9GQTEaqGEdUVfIlOh3UklgeS/SCwloOJFr6kCgYEA0sr5 +lygR6+ygucoQZW7pjPmkOxQUfCuQBT+u2UPNRkrdNSA+QnK6URwOUxm1DNvgMEL6 +UOo78FpOE7dutMF25wr4ay49FJoxPC/mZJK3nPTWMrUq1z+JVjUqoF1dlBgDhFb1 +/yNsUJEdBoFjwbtj63EibX2WIX5+RIKH/SMm9GsCgYBkilkGHLjNwIi1reK0vjI+ +SIVqTgRFRRK9rh3hhgurifASOQ7jFz5fudJS3wOSBd6FLJcEp1bN1Z8TFF0K16hR +K5X58J5WKgNeLmrN3LG6Cx+Etn0YXef+mV5Nx8qJ0z4UeELvLFwrM5dhbT9gnsOY +iETh71wKggN6xLLjkM2FOQKBgQCwH5Pnbj17KF0qnuCQP9m4RqWoDyEGlsdg+1K2 +ieYsA0VMrEIY9w8h0hVN7b7OnbB14qCPlwa5zlpKMwu2z6bvaMUjmKDEZAkbRtJz +2fq8k/2cpK7E5ntzojyZfSlBIcdefeJQaWKI9paP5vBY4J+eCws+/J3CIpSR3ZaO +NR7JPQKBgGaxRPBoODtViQNSgELQwtvl9b7wfjrq9zr+QDu7IliJHTO2EHr5c0BT +xHVDwKbwhYTXu7FY/UDiVi9qJarna2a3hDhxTuXNcIsMcY8j7ehBtwcEQUh3XHkl +rlDMifkgcIbspSzLfpZMt3WtlLPRN/Zd6R3NpsYBXb8y7FgrevCv +-----END RSA PRIVATE KEY----- diff --git a/docker/test/secret/ssl.pem b/docker/test/secret/ssl.pem new file mode 100644 index 0000000..f8040da --- /dev/null +++ b/docker/test/secret/ssl.pem @@ -0,0 +1,61 @@ +-----BEGIN CERTIFICATE----- +MIIF+jCCBOKgAwIBAgIQCd3UR/8eiz+PnIuPMYAJTzANBgkqhkiG9w0BAQsFADBu +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg +RFYgVExTIENBIC0gRzEwHhcNMjMwNzExMDAwMDAwWhcNMjQwNzEwMjM1OTU5WjAe +MRwwGgYDVQQDExNraWNjLmthbmdsYWlsYWIuY29tMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAv4FqBfyUlNxtsL1Rv2ybsRPGRpPgUs8kXEQEacxk4zj9 +8z53NBO6v547pxZCZQpX0V2g8tel9LSalJfzeU5lFmUWo8fIb/KJL3XIAtE6JDCn +e+2MsgliRyUFizwoQhyjiDoBU38Dh4jPzuldynsrqtkwdoV+mi6vreOYTTvq7mXT +JPvOV2MKbpcPrO4JMTUr5gIiEIWIddnnrlQUCBZtpei6AYxz9LfTdzNC0L+LeUNL +QK0yKWPEzPbyh90XTgBKGx5d5NDwvgK2fVKOUeKyDuMS5pflzlBrez/tsSIJlMyc +f+OlusUgdVpD+ionmwleEbFIX19kwPxJdOhKLKN/owIDAQABo4IC4jCCAt4wHwYD +VR0jBBgwFoAUVXRPsnJP9WC6UNHX5lFcmgGHGtcwHQYDVR0OBBYEFEr7Uu2aYP03 +3jwRgau6oHbho1ykMB4GA1UdEQQXMBWCE2tpY2Mua2FuZ2xhaWxhYi5jb20wDgYD +VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjA+BgNV +HSAENzA1MDMGBmeBDAECATApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2lj +ZXJ0LmNvbS9DUFMwgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYYaHR0cDov +L29jc3AuZGlnaWNlcnQuY29tMEoGCCsGAQUFBzAChj5odHRwOi8vY2FjZXJ0cy5k +aWdpY2VydC5jb20vRW5jcnlwdGlvbkV2ZXJ5d2hlcmVEVlRMU0NBLUcxLmNydDAJ +BgNVHRMEAjAAMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdgDuzdBk1dsazsVc +t520zROiModGfLzs3sNRSFlGcR+1mwAAAYlE6nV/AAAEAwBHMEUCICLfvgTkH5+9 +26HHK9OZttW3+ro29cFkRotfJ5L1HFVTAiEA/286k4UJ7NELqGK9h9cA+0RW1urS +a4NpItAnz8ojm2YAdQDatr9rP7W2Ip+bwrtca+hwkXFsu1GEhTS9pD0wSNf7qwAA +AYlE6nWNAAAEAwBGMEQCHxbjQpt42VdYq3IOGxfkVRuoM888b85dJGT47KYEP2AC +IQCp3jKf9PJSgdXEdb9wESTGVcIRm80JrHUtmR2lMmu+1wB2ADtTd3U+LbmATosw +Wwb+QDtn2E/D9Me9AA0tcm/h+tQXAAABiUTqddkAAAQDAEcwRQIhAMabvTGdsX4y +U9mpZGwNGduN5xNugnaj5AAsGbtlgA6eAiAvWxxbdsBEWjYxkAfJXyYo2ncuJwZC +vJP2qATY/0HaETANBgkqhkiG9w0BAQsFAAOCAQEAnUtijXy1pu+hyTBp9Lgd/lqF +0WF6AWfNZxBvbrLN5a3JxLVcPuk2ioUOGF23l0EwwPPBH9xR1qIPb522YIFWN7Vc +OVgihHFoACaulNk6ykFkGjgTESj4VCeVBkSmknivQaVAyvAN/Tp+5llqAf3KzyYK +gVaqTp/yP918+luSe0V22CcUm88nSDw2Hl3obsMOd0TIfMhQ/oKz4+dI8wkEf+w7 +Zax3HXCUpOl1hLiagCRdU01CEqt9SSHLwyisAhUGERbEWv1zJlz/kUZSkQ4ZV3Su +xBsmgJ7VbA/Z27s+YWUe/kel5zGqczCo2c6DYVvcBgkExhd71vG4otnDa8uhCQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIQAnmsRYvBskWr+YBTzSybsTANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0xNzExMjcxMjQ2MTBaFw0yNzExMjcxMjQ2MTBaMG4xCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH +MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPeP6wkab41dyQh6mKc +oHqt3jRIxW5MDvf9QyiOR7VfFwK656es0UFiIb74N9pRntzF1UgYzDGu3ppZVMdo +lbxhm6dWS9OK/lFehKNT0OYI9aqk6F+U7cA6jxSC+iDBPXwdF4rs3KRyp3aQn6pj +pp1yr7IB6Y4zv72Ee/PlZ/6rK6InC6WpK0nPVOYR7n9iDuPe1E4IxUMBH/T33+3h +yuH3dvfgiWUOUkjdpMbyxX+XNle5uEIiyBsi4IvbcTCh8ruifCIi5mDXkZrnMT8n +wfYCV6v6kDdXkbgGRLKsR4pucbJtbKqIkUGxuZI2t7pfewKRc5nWecvDBZf3+p1M +pA8CAwEAAaOCAU8wggFLMB0GA1UdDgQWBBRVdE+yck/1YLpQ0dfmUVyaAYca1zAf +BgNVHSMEGDAWgBQD3lA1VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYw +HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C +AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp +Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu +Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG +/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT +MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAK3Gp6/aGq7aBZsxf/oQ+TD/B +SwW3AU4ETK+GQf2kFzYZkby5SFrHdPomunx2HBzViUchGoofGgg7gHW0W3MlQAXW +M0r5LUvStcr82QDWYNPaUy4taCQmyaJ+VB+6wxHstSigOlSNF2a6vg4rgexixeiV +4YSB03Yqp2t3TeZHM9ESfkus74nQyW7pRGezj+TC44xCagCQQOzzNmzEAP2SnCrJ +sNE2DpRVMnL8J6xBRdjmOsC3N6cQuKuRXbzByVBjCqAA8t1L0I+9wXJerLPyErjy +rMKWaBFLmfK/AHNF4ZihwPGOc7w6UHczBZXH5RFzJNnww+WnKuTPI0HfnVH8lg== +-----END CERTIFICATE-----