From 691143fc817aab6fb7c4e1162551cb3f347712a7 Mon Sep 17 00:00:00 2001 From: Ilya Date: Mon, 11 Apr 2022 13:11:43 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=20=D0=B0=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D0=B8=20(#26)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Обновление --- README.md | 3 +- certs/fullchain.pem | 138 +++++++++++++++++++++++++++----------------- certs/privkey.pem | 52 ++++++++--------- 3 files changed, 114 insertions(+), 79 deletions(-) diff --git a/README.md b/README.md index 1218431..5514baa 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,8 @@ cd docker_fresh После добавления всех дистрибутивов в каталог, он должен выглядить примерно следующим образом ![](https://i.ibb.co/S50sF96/2020-04-10-16-03-22.png) -Файл **smtl.cf** это файл **demo/1cv8_service.cf** из комплекта поставки **1С:Библиотека технологии сервиса** +Файл **smtl.cf** это файл **demo/1cv8_service.cf** из комплекта поставки **1С:Библиотека технологии сервиса** +Для **1С:Библиотека технологии сервиса** версии 2.0 и выше, нужно взять файл расширения из комплекта поставки **1cv8.cfe** или **fresh.cfe** и разместить его рядом с файлом **smtl.cf**, назвав **smtl.cfe** ##### Настройка списка создаваемых информационных баз В файле `/docker_fresh/other_files/params.json` расположен список информационных баз в формате **JSON** которые требуется создать diff --git a/certs/fullchain.pem b/certs/fullchain.pem index 76c0a19..e9e85ff 100644 --- a/certs/fullchain.pem +++ b/certs/fullchain.pem @@ -1,57 +1,91 @@ -----BEGIN CERTIFICATE----- -MIIFPjCCBCagAwIBAgISBCOqEdsHN7tNhE9VJN5FZVr5MA0GCSqGSIb3DQEBCwUA +MIIFMzCCBBugAwIBAgISAwHVJdnPp36VhzsD1DgFqOgZMA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yMTAyMDEwNzIwMTdaFw0yMTA1MDIwNzIwMTdaMBYxFDASBgNVBAMT -CzFjZnJlc2guZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqznH -AXnf0BEOQHEV1t0L+Us7JFlRmabe+XVjne4KUTMRYaDJ0I+lztEqluMynL/C7yQ/ -ZvL7p/9iynUMnvVtFKswI2dmSl0oTEZ/AS1R9y98B1CCb8sLrf5R04Cg0LjWd/MQ -t/GQ1ouIJDm2Elre3rxIX/UawpKMwKVeIwMkLDqUFXLH80vMI7DsbX0GZ9lJ8LkU -pEUg4xhW9kkrAVcreuvlP40z5vjR9rW72SUaASl4aPOPzImoUVoOzfyuJovAWEit -PQPYwYMsphCAmWYLGag/FVJQNcQeXNT2zVfn8zAaUkNfN78Zqiojqbqcf3eClt1y -4c6hxtorBB2lYg7axwIDAQABo4ICaDCCAmQwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud -JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW -BBQPLfpnHwBI4I6OHQab8w6Bwb+x+TAfBgNVHSMEGDAWgBQULrMXt1hWy65QCUDm -H6+dixTCxjBVBggrBgEFBQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9yMy5v -LmxlbmNyLm9yZzAiBggrBgEFBQcwAoYWaHR0cDovL3IzLmkubGVuY3Iub3JnLzA3 -BgNVHREEMDAugg0qLjFjZnJlc2guZGV2ghAqLnMzLjFjZnJlc2guZGV2ggsxY2Zy -ZXNoLmRldjBMBgNVHSAERTBDMAgGBmeBDAECATA3BgsrBgEEAYLfEwEBATAoMCYG -CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCCAQUGCisGAQQB -1nkCBAIEgfYEgfMA8QB3AESUZS6w7s6vxEAH2Kj+KMDa5oK+2MsxtT/TM5a1toGo -AAABd1ytnC4AAAQDAEgwRgIhAJ9evctqwxO2YlgL6GuhEFb88rwJFmtT8z0tDbhy -HE6tAiEAj3s5LU3wuTTCJ8CfZnPOSV2lyL3Z2VrQHucB+T5YWzoAdgB9PvL4j/+I -VWgkwsDKnlKJeSvFDngJfy5ql2iZfiLw1wAAAXdcrZxGAAAEAwBHMEUCIDEkzQTZ -HiU3my6rOX59BxFoE9YnOsbpQO4oQ4eePf6aAiEAr0+LPRkt7uV0V1cmM2Mia9l0 -a3lCvnCXZFPiRba0Vc8wDQYJKoZIhvcNAQELBQADggEBAIaFRThVFxFl0VIMDtL3 -ChiqJ2I85oSFuUvZxk1Sh9bQsfPXPi/yEwAX2p15FTAl9JYJisw5ukIkKQVwDK/w -wgc1fMjzRlLA5dVCqLux9Jfl+mPCa/VWm3rK9sjk2dPjWGWOTBI3cW0YtblqNyka -RC9Swq5ip2iJQ/De30mUREgxdXr0NT+TgUgkMMrLSugjaC0z7WhtCFZU1PpBeaoG -uE8LHnWVvzrtnYFhArQUFiqc3l7VUqHh/6MRxo2QOf9aqa9O4HHkMJAs+tL/csln -FAVYsFxBRWZcvONfrvh4HNGrLrFXQEJKbRaEXoHLFbwD50W3gs5e30ObKErBjZST -zdo= +EwJSMzAeFw0yMjA0MDEwNzA0MThaFw0yMjA2MzAwNzA0MTdaMBgxFjAUBgNVBAMM +DSouMWNmcmVzaC5kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDX +CycozH41A9LjHiJWi/Cgv96F7UV6KjGT2M8gfXlLkI3GHLquY8qB6YFOUEh4gKSj +E+aF5NnJ9xrcvHDyz4WzLlXvzns/LDzcitYE2Jjx0sPC1CS8fyE9j1KPpS5nOXcQ +GGf2ECuo+i7eva/BUUF3Tl9h1Ee/hJzDilfkQb6wTcabbsGROEvyDR27RRP2R8xl +rRZEJ8k9t8uI7liCu4LJbIQCOGBYKCD4xYW28njDzvyAY/M/n7gFtAdpBwjuzUnu +k4wfGzgy05D9bJKZxH2JOMg8pA1v67HZBcfzB1SV/XPABut5ztokECtU1UOiMulD +PaXz/of5EskdyD/w8ZgLAgMBAAGjggJbMIICVzAOBgNVHQ8BAf8EBAMCBaAwHQYD +VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O +BBYEFAD2AZX730UKs0EzHlRBipv3agDQMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJ +QOYfr52LFMLGMFUGCCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3Iz +Lm8ubGVuY3Iub3JnMCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcv +MCoGA1UdEQQjMCGCDSouMWNmcmVzaC5kZXaCECouczMuMWNmcmVzaC5kZXYwTAYD +VR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYa +aHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEFBgorBgEEAdZ5AgQCBIH2BIHz +APEAdwBByMqx3yJGShDGoToJQodeTjGLGwPr60vHaPCQYpYG9gAAAX/kJ1txAAAE +AwBIMEYCIQDYBmq5Cn9L57982AK3m2DRK8oELtWrVVyhl2j+QBMb7QIhAIdDonc2 +wZxqwfWa0DYpbHJF5uMe21m1/7Heniebxk9zAHYAKXm+8J45OSHwVnOfY6V35b5X +fZxgCvj5TV0mXCVdx4QAAAF/5CdbWgAABAMARzBFAiA7YOdf4L6WPWgr3MkJpbJ5 +OEjcuoz7D5PWm8eBaKJPTAIhALk1IrzyPD5HgvAM15CGUnb5Z/0vUHqkvqJg0v6b +I0dJMA0GCSqGSIb3DQEBCwUAA4IBAQAsaCfCBZ4wBciR4oD4NuJhHaUIV+o94Taj +MXWC/E+jRWKGqv++FJKe8c/iq/rzqFZ+Pw8dx5ekzD0HT6UMhefKTMkSC50PbEdj +9mIffT0MAkjVkdWuOQd4voZtXmfpOPJDINBfBfqEMyZNXhuBuId8OCU/8wN5X/vC +D7yzPSPg5m51GNQ3ai3j3PSl9E+yVhxYSNZtt4kI1cODstiGHHhTYOcr/q1XDKsF +4cJO2F0GnMQoxmTvOAigavHnnLp2D8fUUgWA1CMW4NFqRIYr9TuJmNtfk2olKC1F +VqY+NxBxj5q7VOlovEoUTfk0ihbnQSzfPjTIdPIlr/ocuSkEdqUL -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow -MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT -AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs -jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp -Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB -U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7 -gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel -/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R -oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E -BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p -ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE -p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE -AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu -Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0 -LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf -r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B -AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH -ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8 -S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL -qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p -O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw -UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg== +MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw +WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg +RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP +R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx +sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm +NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg +Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG +/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC +AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB +Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA +FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw +AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw +Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB +gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W +PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl +ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz +CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm +lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4 +avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2 +yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O +yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids +hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+ +HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv +MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX +nLRbwHOoq7hHwg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/ +MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT +DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC +ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL +wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D +LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK +4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5 +bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y +sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ +Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4 +FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc +SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql +PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND +TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw +SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1 +c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx ++tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB +ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu +b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E +U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu +MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC +5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW +9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG +WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O +he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC +Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5 -----END CERTIFICATE----- diff --git a/certs/privkey.pem b/certs/privkey.pem index 77bce77..3330a8d 100644 --- a/certs/privkey.pem +++ b/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCrOccBed/QEQ5A -cRXW3Qv5SzskWVGZpt75dWOd7gpRMxFhoMnQj6XO0SqW4zKcv8LvJD9m8vun/2LK -dQye9W0UqzAjZ2ZKXShMRn8BLVH3L3wHUIJvywut/lHTgKDQuNZ38xC38ZDWi4gk -ObYSWt7evEhf9RrCkozApV4jAyQsOpQVcsfzS8wjsOxtfQZn2UnwuRSkRSDjGFb2 -SSsBVyt66+U/jTPm+NH2tbvZJRoBKXho84/MiahRWg7N/K4mi8BYSK09A9jBgyym -EICZZgsZqD8VUlA1xB5c1PbNV+fzMBpSQ183vxmqKiOpupx/d4KW3XLhzqHG2isE -HaViDtrHAgMBAAECggEAIU5f032td3+Z0hctNFpTFe74Vh25rbWz8bpP4kyHXTwd -yWvJVfRbQFuXeTpAghUbCgF3A8OICCm5QcB68AC1cyvJdVmLoDN2vz+HPOdf5kEq -UxHqDWzlnLa3m/iNT4xky3hQbDdlARarKMDBFdjvOUxOl7vJtMdk8aQ5J35Y7vE0 -oWAfPi+2zovp3Zc4hj9m0jr1md6rUj+IMdrSvpZ6kEzn63XOa/WnFjzRIdWZiLWC -PVltItTDP+XZCPNBRPjUHOZf813vPOR/1MMcYJ/DRxDEudVVfMSGBpvZ+uDKFvW/ -+Y+fiiatdTZFmeQjdlka3DH9T0aG67Tpd6TRV+KNwQKBgQDR4/E61tvQ+0fLanml -30BIAjnoKd4PrijpzHDwZZ5zfPQtFmyg+7er2Kxh0nP+wBwwoJS7Bh/zeNa2OT9H -FhwiaLAadXeUshFIDVsEWsQ+vSoB48RT5BVS25qlBGBhfksbsaBsNsQhNbX5S6SA -zp201caAdFND/5cUqvzkNofG3wKBgQDQ111kVtsJP/jTEKWYAnRG5i/5sfuloaPK -UGvGv9gF2lA8DJOky9hsKgHQSyfC2UobyWvf2tulz7xHVcIY5vILi/D+3R4qntUp -aS1PL9li1gajJ9/Ffot5wAFbNW6hNddw3Ygtr85ls29eqBy/gbAXEOq8vojRKZW4 -Mc1vtHxxGQKBgQCxCoRADVv9OvekLXvO3jFqi/YsTqRwtYbtLvVU0WKGJ7APGAso -/yo+WdWN7ebJy2H74neSCeiJhjQWINOvMocovwVMTClB07GgBSPw2F8QTJ9SWL0R -xiH2ciZPaxGhKtZP1dRrcwacvKFyVsu7moyMLIXzdCuH/9+AH3qRRS3iIQKBgQC1 -zlcaS9ahRdS7Aen23GQXeLrZOA2n0oDBVqOMwWQxLC3fKN+7fk4pU6SCjXrO0NUI -PaAwn9nJjoAM5eZ0QVEDpk8lwJ9LYTyWsV5lanVn6oSastLGnnSTiAhmO6zUoQet -1N2BUGRw+vWARP/J4//FBNAlggWfeQFC+fArR8dxuQKBgDfBbAOa+KN8gI/4qxmM -9AjUaGYhw0Orxz4CQDnIPHtcm2plArgr/JWcI7uWVq3t1/IHoItXMtlhj4BvP7sS -BkNTBbSKJMg4MNES+mp9gdHTiXukAQyXFFWf+7tGO/XAIksMrxvY8hNfj7IWx1hV -PeU3KdySNgkdy8kefED2LslN +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDXCycozH41A9Lj +HiJWi/Cgv96F7UV6KjGT2M8gfXlLkI3GHLquY8qB6YFOUEh4gKSjE+aF5NnJ9xrc +vHDyz4WzLlXvzns/LDzcitYE2Jjx0sPC1CS8fyE9j1KPpS5nOXcQGGf2ECuo+i7e +va/BUUF3Tl9h1Ee/hJzDilfkQb6wTcabbsGROEvyDR27RRP2R8xlrRZEJ8k9t8uI +7liCu4LJbIQCOGBYKCD4xYW28njDzvyAY/M/n7gFtAdpBwjuzUnuk4wfGzgy05D9 +bJKZxH2JOMg8pA1v67HZBcfzB1SV/XPABut5ztokECtU1UOiMulDPaXz/of5Eskd +yD/w8ZgLAgMBAAECggEAB0f2ZHhAEbV2b4A2s217kUXN2AUHpDJHiXT+1l/JOpjD +ZCDW5U61rZ5lZWxsd8ALUwY6ePAdu6vlOfIbdO033rBD8qGwJJxv1xvQUUuwKgfz +3uXl9IftbTMsHXb/Ujls4Zuh8X/sqoUGDz6m88m3iL2blylj4IUx9aD6htz/AuMf +VAbx1ZxfelDJXjaEX6pqQyr5vdT3RcLNpXh6bN5mst1sDBKE6mci91nP18b2XS6O +YmQRkyIVr/FdiUz7MNaqEJ42Y1zHI+tzWWZNgSp9NJ0OqaqE6X86pIB8RAaggACM +9/RsGxjgMykG6JkjptT7LeaJIw7PXGvCCh9FZEAOIQKBgQD+zWsqyOIbdmwbM57p +6jx42V5TC5wKVdIwZdwP9jrVayK1UPD4H6wzjdOdfWmGhAWjj6XMqmHurSifAFYi +0hNrlfyErnVJiTgx7ELIZpiarPYjf0s0ppW1B+6rQNqU7OiAy6tHfI+qfHD9mU3k +fPuZh9uHKl9PN5DSyqfxCy9GuwKBgQDYDeVg9RNEIZyplO34awQRB34S2LWcrFvP +e22qkiz4cRRJgGnJtwk1smIFk1ArVt6Ceo3uYDYxZ2u970PR8ZhsVKKuMd6FBV8A +1EoajosFdXAQ/G6VpA5UEMIc+60Xf22re96TUQFuLf+eJLz9FiUyjsTezj4mRT5N +yXULO2zm8QKBgQCP6UeI/7KtHiKK7onnxdNn0iVzNBBqyfQQP8eeAE1UctFEpTWk +focNCyKlRcsPHYvtyFk1kloDqytROqhrvEkZr7nS2pIF+YmSsMU7WK8CVYQjombA +kwHlIFjNwrByAqiC7gWMN68Q9H4AzdBvp6OXIGN+IRF5tYGHfMyD2PRXtwKBgQCp +x2G1K2EUbQVbDbljOVVcvHKKBNnSYG9VQD0RiQTlxpaWm96FsNv/4km87+JT7FO2 +XPAjnl93uzmja93zoNKSbn/YO0ANcAcT876318PPalXCQ1vzI5RO40xm0i9XA7/+ +vbxOL53cIzF36I7Koxhf/mkeXRvhnxAyuFjNlskhQQKBgF8xZ55OloMe+VYR/xie +map84wf7aoShbyV3vQWIMFaScdiemMrd79ccZ5UJ/oGqhCkrDAwQAPtinc6Eedo+ +XQk6HOnVAFo0xq00chZ9g+8uUEMblKLDjbI5lCOFQcqMPZwfsyq31Titu688ErQW +FRVIMaDTOt0WcvYYuZl1piaK -----END PRIVATE KEY----- From 1136bf47f850d687dc323f6f82d56417c07351fb Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Mon, 11 Apr 2022 13:46:55 +0300 Subject: [PATCH 2/2] fix problems --- images/core/Dockerfile | 2 +- images/core/entrypoint.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/core/Dockerfile b/images/core/Dockerfile index 23ccd4b..8962c72 100644 --- a/images/core/Dockerfile +++ b/images/core/Dockerfile @@ -11,7 +11,7 @@ RUN yum -y localinstall /tmp/core/*.rpm; \ yum -y install x11vnc metacity net-tools gdb perl tar git jq; \ yum -y install https://centos7.iuscommunity.org/ius-release.rpm; \ yum -y --setopt=tsflags=nodocs install python36u python36u-devel python36u-pip; \ - yum -y install java-1.8.0-openjdk; \ + yum -y install java-1.8.0-openjdk iproute; \ cert-sync /etc/pki/tls/certs/ca-bundle.crt; \ oscript /usr/share/oscript/lib/opm/src/cmd/opm.os install deployka; \ chmod +x /usr/bin/deployka; \ diff --git a/images/core/entrypoint.sh b/images/core/entrypoint.sh index 35179d5..b8c9c7a 100644 --- a/images/core/entrypoint.sh +++ b/images/core/entrypoint.sh @@ -18,9 +18,10 @@ then echo "Failed to start ragent: $status" exit $status fi + rm -rf /tmp/.X99-lock exec /usr/bin/Xvfb :99 -screen 0 1680x1050x24 -shmem & - exec metacity --display=:99 & - exec /usr/bin/x11vnc & + sleep 5 && + exec /usr/bin/x11vnc -display :99 -forever & status=$? if [ $status -ne 0 ]; then echo "Failed to start Xvfb: $status" @@ -44,8 +45,7 @@ elif [ "$1" = 'cli' ] then chown -R usr1cv8:grp1cv8 ${CORELOGS} exec /usr/bin/Xvfb :99 -screen 0 1680x1050x24 -shmem & - exec metacity --display=:99 & - exec /usr/bin/x11vnc + exec /usr/bin/x11vnc -display :99 -forever elif [ "$1" = 'web' ] then chown -R usr1cv8:grp1cv8 ${CORELOGS}