From 71d3d0925874247de5e657821638b1c08360f571 Mon Sep 17 00:00:00 2001 From: efiacor Date: Thu, 8 Apr 2021 16:40:06 +0100 Subject: [DMAAP-BC] Consolidate bus controller repos Migrate BC CSITs to the repo Fix documentation Signed-off-by: efiacor Change-Id: I874ed61be1b61187e233e9fd0937f6658f0ec0f0 Issue-ID: DMAAP-1544 --- dbc-client/certs/ca.pem | 31 +++ dbc-client/certs/client.pem | 51 +++++ dbc-client/certs/key.pem | 34 ++++ dbc-client/misc/aaf-ca.crt | 31 +++ dbc-client/misc/dbc-client | 6 +- dbc-client/pom.xml | 335 +++++++++++-------------------- dbc-client/src/main/resources/Dockerfile | 22 +- 7 files changed, 280 insertions(+), 230 deletions(-) create mode 100644 dbc-client/certs/ca.pem create mode 100644 dbc-client/certs/client.pem create mode 100644 dbc-client/certs/key.pem create mode 100644 dbc-client/misc/aaf-ca.crt (limited to 'dbc-client') diff --git a/dbc-client/certs/ca.pem b/dbc-client/certs/ca.pem new file mode 100644 index 0000000..e9a50d7 --- /dev/null +++ b/dbc-client/certs/ca.pem @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV +BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx +NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK +DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7 +XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn +H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM +pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7 +NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg +2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY +wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd +ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM +P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6 +aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY +PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G +A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ +UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN +BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz +L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9 +7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx +c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf +jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2 +RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h +PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF +CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+ +Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A +cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR +ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX +dYY= +-----END CERTIFICATE----- diff --git a/dbc-client/certs/client.pem b/dbc-client/certs/client.pem new file mode 100644 index 0000000..be702e4 --- /dev/null +++ b/dbc-client/certs/client.pem @@ -0,0 +1,51 @@ +-----BEGIN CERTIFICATE----- +MIIEOjCCAyKgAwIBAgIIWY+5kgf/UHgwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE +BhMCVVMxDTALBgNVBAoMBE9OQVAxDjAMBgNVBAsMBU9TQUFGMRkwFwYDVQQDDBBp +bnRlcm1lZGlhdGVDQV85MB4XDTE5MDMyMjE3MzczOVoXDTIwMDMyMjE3MzczOVow +dTERMA8GA1UEAwwIZG1hYXAtYmMxDzANBgkqhkiG9w0BCQEWADEjMCEGA1UECwwa +ZG1hYXAtYmNAZG1hYXAtYmMub25hcC5vcmcxDjAMBgNVBAsMBU9TQUFGMQ0wCwYD +VQQKDARPTkFQMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAIbXUfdwsXG5h0rGBPk55GVNVVyUgsr9FGXEY/tueagFcseO6mM9M0R8 +FUJU5tdYx6N70nT0qOVfJoT/fwannISriV7AchAZ9WUDr+SHSaQNEJ7ieeNGTa7F +gJ1+he+b4Yhn/lg88gfWgFGXssgAcFWN24kwrXLckyEs0yATFYXoYKBTLAy+RGtS +SoxWynFCwPUgKh48ntg5ixxgQkGTfWWT4sQTBDmseOTQqtPI4rIeLi+F1QkDNtNJ +Ykh0AgThFUQyfQo5U8mRhja09VH26py21ixQtiHip5YHDo5O+kquTAdMvsxRJwOP +0QxcsQ9dwbEnmCga4R1ovRgpgjukUvMCAwEAAaOB+zCB+DAJBgNVHRMEAjAAMA4G +A1UdDwEB/wQEAwIF4DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw +VAYDVR0jBE0wS4AUgfeZWxC5yIze81Je6k5poEM+rN2hMKQuMCwxDjAMBgNVBAsM +BU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVU4IBBzAdBgNVHQ4EFgQU +dqzcMO4LYabneetqEM+7SLQjd/YwRAYDVR0RBD0wO4IIZG1hYXAtYmOCIGRtYWFw +LWJjLmFwaS5zaW1wbGVkZW1vLm9uYXAub3Jngg1kbWFhcC1iYy5vbmFwMA0GCSqG +SIb3DQEBCwUAA4IBAQBRC/5AB+KljMFKTGO6GYqwD21Sh5IbofpeUTAqFsg79l+q +/tehho2y/5ZfccL1ChBm09QY2Xit1ObWqOTEQmchNxhKCLfrSEi3/r9tYwqf698u +3DIprR0Y24ShNw9nAejmNQ8GfPiLhtQ8wPLvNrpUTguC8xKgVqX0VEWLSRNBIVL1 +IiKcamhvuj3t5Sp9PIP02Ig1DvB5lnCJkA+XBCN3B8qTRltTA/FHHMDiDRShWX/V +XjLZm7tvuyWQYddrSgEfJVClQtVDYnfRGmpGAsR4Mqxg3l0SojRpiEfiKBwVn3dj +7ScB3lVlq5cUyS45NbSK0p/Ln24t4ahknPw1/W44 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEdTCCAl2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB +RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwODE3MTg1MTM3WhcN +MjMwODE3MTg1MTM3WjBHMQswCQYDVQQGEwJVUzENMAsGA1UECgwET05BUDEOMAwG +A1UECwwFT1NBQUYxGTAXBgNVBAMMEGludGVybWVkaWF0ZUNBXzkwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv0HHUkba3uNtNI3jPKimUcd6RNwmhSCJL +neMWpnjqp5/A+HCKyNsEaT4y177hNLmCm/aMm1u2JIfikc+8wEqLCSBBPz+P0h+d +o+sZ7U+4oeQizdYYpEdzHJ2SieHHa8vtu80rU3nO2NEIkuYC20HcKSEtl8fFKsk3 +nqlhY+tGfYJPTXcDOQAO40BTcgat3C3uIJHkWJJ4RivunE4LEuRv9QyKgAw7rkJV +v+f7guqpZlXy6dzAkuU7XULWcgo55MkZlssoiErMvEZJad5aWKvRY3g7qUjaQ6wO +15wOAUoRBW96eeZZbytgn8kybcBy++Ue49gPtgm1MF/KlAsp0MD5AgMBAAGjgYYw +gYMwHQYDVR0OBBYEFIH3mVsQuciM3vNSXupOaaBDPqzdMB8GA1UdIwQYMBaAFFNV +M/JL69BRscF4msEoMXvv6u1JMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/ +BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B +AQsFAAOCAgEADxNymiCNr2e37iLReoaxKmZvwox0cTiNAaj7iafRzmwIoY3VXO8Q +ix5IYcp4FaQ7fV1jyp/AmaSnyHf6Osl0sx8PxsQkO7ALttxKUrjfbvNSVUA2C/vl +u5m7UVJLIUtFDZBWanzUSmkTsYLHpiANFQKd2c/cU1qXcyzgJVFEFVyyHNkF7Is+ ++pjG9M1hwQHOoTnEuU013P7X1mHek+RXEfhJWwe7UsZnBKZaZKbQZu7hEtqKWYp/ +QsHgnjoLYXsh0WD5rz/mBxdTdDLGpFqWDzDqb8rsYnqBzoowvsasV8X8OSkov0Ht +8Yka0ckFH9yf8j1Cwmbl6ttuonOhky3N/gwLEozuhy7TPcZGVyzevF70kXy7g1CX +kpFGJyEHXoprlNi8FR4I+NFzbDe6a2cFow1JN19AJ9Z5Rk5m7M0mQPaQ4RcikjB3 +aoLsASCJTm1OpOFHfxEKiBW4Lsp3Uc5/Rb9ZNbfLrwqWZRM7buW1e3ekLqntgbky +uKKISHqVJuw/vXHl1jNibEo9+JuQ88VNuAcm7WpGUogeCa2iAlPTckPZei+MwZ8w +tpvxTyYlZEC8DWzY1VC29+W2N5cvh01e2E3Ql08W1zL63dqrgdEZ3VWjzooYi4ep +BmMXTvouW+Flyvcw/0oTcfN0biDIt0mCkZ5CQVjfGL9DTOYteR5hw+k= +-----END CERTIFICATE----- diff --git a/dbc-client/certs/key.pem b/dbc-client/certs/key.pem new file mode 100644 index 0000000..626808e --- /dev/null +++ b/dbc-client/certs/key.pem @@ -0,0 +1,34 @@ +Bag Attributes + friendlyName: dmaap-bc@dmaap-bc.onap.org + localKeyID: 54 69 6D 65 20 31 35 35 33 32 37 36 32 35 39 35 31 37 +Key Attributes: +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIF5PqSgjMov0CAggA +MBQGCCqGSIb3DQMHBAixJfKmWd1DMgSCBMjTM5MC/ph+HtvXlN2+UuYTJ2wgobmn +jsNJPEjbRgljxn+hK5MAPwXMwIHqjfYU+OArQjnpkrZmp+FOQf3wLum12u/Nk7/B +IjBQqNum6NXdWdv6+ldhW9SEwSO1ILSogF12A3KuJA9B4E9z0MvyduRVDxFFiEjX +sWR3p6DlUCzaazU6QzxKY7tn4LPv3mQDUJpARdMFfEha/Pd9b7lnpHu5p1UjyzPu +8SZQ5ygwdsFmyxmzqn/zQwDT6l4XHkLxvtHJWtQ2I2wyNMIHJB14rlLzqputKU6C +yErm6uazN+sVzYjsJblJ3CMK9ugbeeg4sLyz6rsl3aZMhHG++EPAh99JXMVE4/2l +ShzKPwO+BKqfIp8tSYgpHUKo64nwtTqRYZ3eEVRkDaOIaff9faXsM90wKzzQbVC5 +c/M9rOkwB+OVwC5HWGcZQMKc1a4VFPe/jv/ULlFQEiyxEliCTdNMmFA6cG3qRv8B +M9p3rNg6xAWny3rS0n47JhJalD8Fn05Pevyr4OSMsLJXt673S+uFCCx2r86H7sw6 +PWdNmD9OWOr4BSBRiD/oe3U+lgZp361W/ueyuDORbyLwlMA/aMvDKDJmmn9Ah9Qs +X4hBWUO7GUw0N+uVC71QhGPhPheG9BmawXAByPCDVf6UAAGnruzcqnE1MVmdAFw0 +OEW21fLXpYVrMyA2QOtjPnutN/KVUVjI1ly9lwgnnkDMUWoEKKXIBHBXv2kMTLeD +xKCMjd7vO6VjzumnwuX9opPME1pFN8IaN7YqkK8K4Rp43FiVl0GcShLr8oRAqhBN +QCW42DRFoEr1xyzgZQ4S8A1GV4EfAZytg+saD6S+0UQtEQXrRHFhIK8Yo6r5JxP6 +eN7A41WHkmz1gcp3WwE/oRymA9E54jxPvtGOvoYi6Y2PNP0XqJLaq97moUC9N2YR +Ssie7RJ3N1qMmo2auxRzMcZjt/HlQo8qI0FJeM1uv+CIZbslCGWFrQ/tEt13KCjX +mE0PBy8yLZuTM5gLSdK3qy6s5sw7ekEYYYvt/boe8puM/i/eEEHtIq/EXvJ9ub4W +jeM/uI0ajxhiS06bYMzdfmqsYLgpGlzERHCbf0o26s3CVPug+GWyVaxwohBG5Dpq +wmLsAeqVyULKaEOuruGmmrUL2mAiFYxVbTNR9xg5MX1jV8dduTshvBJGsqBBCl6m +2vct4Beev77b9jP7FMUuHlXp4wDeFkY5s34Jqd35zt1iDKnZvbbDL1f/Ilf3G/Ab +n2XED6DfsjNSxNB06zMJ0h15aW+XDZ9XodqL45YSjAT28Jlp+2oqLv5+8b+l0JGF +CdeMP6YRRzGYBJ4g9GoP7AQK6Ba2bo9oPeTxO9nJiPTtcJAI3PtOte9su7C6ZBtt +IOUM5w+lpsZ/0ekQC3jURAAlpcx73sYqwsSqz8YX5cmhqGGLcpsFipmJvkEv9oMP +J/BWNn/rd16Gx+74j1U29IselWCXz2N+Un5Ke5n0J5oGJx42d1Vxaj97HSamvd25 +0+GyGEMd9hQZjEdlyYRtwuSEECtwQnBBSWZezYW41HClyZ1ZpfCkXXAFGgX5COuj +5Bfp9vDfQkIny6kH9rRyXLSAJb9ISLENH3jjY2rwV0+0UvR6Un2rgTp8HxBClJyf +cbE= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/dbc-client/misc/aaf-ca.crt b/dbc-client/misc/aaf-ca.crt new file mode 100644 index 0000000..e9a50d7 --- /dev/null +++ b/dbc-client/misc/aaf-ca.crt @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV +BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx +NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK +DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7 +XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn +H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM +pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7 +NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg +2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY +wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd +ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM +P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6 +aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY +PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G +A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ +UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN +BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz +L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9 +7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx +c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf +jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2 +RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h +PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF +CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+ +Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A +cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR +ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX +dYY= +-----END CERTIFICATE----- diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client index d1de3e1..461a069 100644 --- a/dbc-client/misc/dbc-client +++ b/dbc-client/misc/dbc-client @@ -44,9 +44,6 @@ AUTH_METHOD=${AUTH_METHOD:-basicAuth} BA_IDENTITY=${BA_IDENTITY:-dmaap-bc@dmaap-bc.onap.org} BA_PWD=${BA_PWD:-'demo123456!'} - - - config() { echo "ENTER config" set -x @@ -113,6 +110,7 @@ init() { done set +x } + dopost() { set -x RETRY_TIME=60 @@ -136,6 +134,7 @@ dopost() { set +x } + doprov() { set -x @@ -155,6 +154,7 @@ doprov() { done set +x } + delay() { echo "DELAY=$DELAY" if [ ! -z "$DELAY" ] diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml index 30940bb..b9a4abd 100644 --- a/dbc-client/pom.xml +++ b/dbc-client/pom.xml @@ -19,11 +19,13 @@ ============LICENSE_END============================================ ECOMP is a trademark and service mark of AT&T Intellectual Property. --> - 4.0.0 dbc-client dbc-client + jar org.onap.dmaap.buscontroller parent @@ -32,231 +34,138 @@ Packaging Platform (DMaaP) HTTP Client for Bus Controller Provisioning. - ${basedir}/.. - 1.0.0 - UTF-8 - - onap/dmaap/dbc-client - https://nexus.onap.org - nexus3.onap.org:10003 - - /content/sites/site/org/onap/dmaap/dbc-client/${revision} - ${maven.build.timestamp} - yyyyMMdd'T'HHmmss'Z' + + ${basedir}/target/${project.artifactId} + ${docker.image.root}${project.artifactId} + /content/sites/site/org/onap/dmaap/dbc-client/${project.version} dbc-client - - org.apache.maven.plugins - maven-site-plugin - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - + maven-resources-plugin + 2.7 + + + copy-jar + package + + copy-resources + + + ${basedir}/target/docker-stage/opt/app/dmaapbc/lib + + + ${multiproject.basedir}/dmaap-bc/target + + dbc-client.jar + + + + + + - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.10,) - install - - copy-dependencies - - - - - - - - - - + + + + ${basedir}/target/docker-stage + ${basedir}/src/main/resources + + Dockerfile + + + + ${basedir}/target/docker-stage/opt/app/dbc-client/etc + ${basedir}/certs + + ca.pem + client.pem + key.pem + + + + ${basedir}/target/docker-stage/opt/app/dbc-client/bin + ${basedir}/misc + + dbc-client + + + + ${basedir}/target/docker-stage/opt/app/dbc-client/etc + ${basedir} + + version.properties + + + + ${basedir}/target/docker-stage/opt/app/dbc-client/misc + ${basedir}/misc + + cert-client-init.sh + aaf-ca.crt + + + - - docker - - false - false - true - - - - - - ${basedir}/target/docker-stage - ${basedir}/src/main/resources - - Dockerfile - - - - ${basedir}/target/docker-stage/opt/app/dbc-client/etc - ${multiproject.basedir}/certs - - org.onap.dmaap-bc.cred.props - org.onap.dmaap-bc.crontab.sh - org.onap.dmaap-bc.jks - org.onap.dmaap-bc.keyfile - org.onap.dmaap-bc.location.props - org.onap.dmaap-bc.p12 - org.onap.dmaap-bc.props - org.onap.dmaap-bc.showpass - org.onap.dmaap-bc.trust.jks - ca.pem - client.pem - key.pem - - - - - ${basedir}/target/docker-stage/opt/app/dbc-client/bin - ${basedir}/misc - - dbc-client - - - - ${basedir}/target/docker-stage/opt/app/dbc-client/etc - ${multiproject.basedir} - - version.properties - - - - ${basedir}/target/docker-stage/opt/app/dbc-client/misc - ${multiproject.basedir}/misc - - cert-client-init.sh - aaf-ca.crt - - - - - - - - maven-resources-plugin - 2.7 - - - copy-jar - package - - copy-resources - - - ${basedir}/target/docker-stage/opt/app/dmaapbc/lib - - - ${multiproject.basedir}/dbc-client/target - - dbc-client.jar - - - - - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - ${project.version} - ${maven.build.timestamp} - - - println 'ver: ' + project.properties['ver']; - if ( project.properties['ver'].endsWith("-SNAPSHOT") ) { - project.properties['dockertag1']=project.properties['ver'] + "-latest"; - project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp']; - } else { - project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest"; - project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp']; - } - println 'docker tag 1: ' + project.properties['dockertag1']; - println 'docker tag 2: ' + project.properties['dockertag2']; - - - - - - - - io.fabric8 - docker-maven-plugin - 0.28.0 - - ${docker.verbose} - ${docker.apiVersion} - ${docker.pull.registry} - ${docker.push.registry} - - - ${docker.image} - - try - ${basedir}/target/docker-stage - Dockerfile - - ${dockertag1} - ${dockertag2} - - - - - - - - generate-images - install - - build - - - - push-images - deploy - - push - - - - - - + + docker + + ${skip.docker.build} + ${skip.docker.tag} + true + + + + + io.fabric8 + docker-maven-plugin + 0.28.0 + + ${docker.verbose} + ${docker.apiVersion} + ${docker.pull.registry} + ${docker.push.registry} + + + ${dmaapbcclient.image.name} + + try + ${basedir}/target/docker-stage + Dockerfile + + ${dockertag1} + ${dockertag2} + + + + + + + + generate-images + install + + build + + + + push-images + deploy + + push + + + + + + - - diff --git a/dbc-client/src/main/resources/Dockerfile b/dbc-client/src/main/resources/Dockerfile index 85f9426..9263e80 100644 --- a/dbc-client/src/main/resources/Dockerfile +++ b/dbc-client/src/main/resources/Dockerfile @@ -4,6 +4,7 @@ # =========================================================================== # Copyright © 2017 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2018 Nokia. All rights reserved. +# Modifications copyright (C) 2021 Nordix Foundation.. # =========================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,24 +33,17 @@ RUN mkdir -p /usr/local/share/ca-certificates && \ mv misc/aaf-ca.crt /usr/local/share/ca-certificates/aaf-ca.crt RUN update-ca-certificates -# Install curl -RUN apk add --no-cache curl +# Install curl & openssl +RUN apk add --no-cache curl openssl -# Install client certs for curl and openssl -RUN apk add --no-cache openssl -RUN mkdir -p /opt/app/osaaf/local && \ - mv etc/org.onap.dmaap-bc.p12 /opt/app/osaaf/local && \ - mv etc/*.pem /opt/app/osaaf/local - -RUN chmod +x /opt/app/dbc-client/bin/* && \ +RUN mkdir -p /opt/app/osaaf/local && \ + chmod +x /opt/app/dbc-client/bin/* && \ mkdir /opt/app/dbc-client/logs -VOLUME /opt/app/dbc-client/log - RUN addgroup -S -g 1001 onap \ - && adduser -S -u 1000 dbc -G onap \ - && chown -R dbc:onap /opt/ + && adduser -S -u 1000 onap -G onap \ + && chown -R onap:onap /opt/ -USER dbc +USER onap ENTRYPOINT ["sh", "./bin/dbc-client" ] -- cgit 1.2.3-korg