From d224c1d74dc43b644e893e570027dfbd46e0d8cc Mon Sep 17 00:00:00 2001 From: Ilya Date: Thu, 2 Jun 2022 11:31:43 +0300 Subject: [PATCH 1/5] renew serts (#27) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * renew sert * Добавил описание развертывания с учетом расширения БТС #21 * renew sert * renew sert * renew sert * renew sert * renew sert * renew sert * renew sert * renew sert * renew sert * renew sert * renew sert * renew sert * renew sert --- certs/fullchain.pem | 44 +++++++++++++++++++------------------- certs/privkey.pem | 52 ++++++++++++++++++++++----------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/certs/fullchain.pem b/certs/fullchain.pem index e9e85ff..d28b9cf 100644 --- a/certs/fullchain.pem +++ b/certs/fullchain.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFMzCCBBugAwIBAgISAwHVJdnPp36VhzsD1DgFqOgZMA0GCSqGSIb3DQEBCwUA +MIIFMDCCBBigAwIBAgISBDGFqnIJwGX2ZpXhB5O5Wh3CMA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yMjA0MDEwNzA0MThaFw0yMjA2MzAwNzA0MTdaMBgxFjAUBgNVBAMM -DSouMWNmcmVzaC5kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDX -CycozH41A9LjHiJWi/Cgv96F7UV6KjGT2M8gfXlLkI3GHLquY8qB6YFOUEh4gKSj -E+aF5NnJ9xrcvHDyz4WzLlXvzns/LDzcitYE2Jjx0sPC1CS8fyE9j1KPpS5nOXcQ -GGf2ECuo+i7eva/BUUF3Tl9h1Ee/hJzDilfkQb6wTcabbsGROEvyDR27RRP2R8xl -rRZEJ8k9t8uI7liCu4LJbIQCOGBYKCD4xYW28njDzvyAY/M/n7gFtAdpBwjuzUnu -k4wfGzgy05D9bJKZxH2JOMg8pA1v67HZBcfzB1SV/XPABut5ztokECtU1UOiMulD -PaXz/of5EskdyD/w8ZgLAgMBAAGjggJbMIICVzAOBgNVHQ8BAf8EBAMCBaAwHQYD +EwJSMzAeFw0yMjA2MDEwNzE3MjdaFw0yMjA4MzAwNzE3MjZaMBgxFjAUBgNVBAMM +DSouMWNmcmVzaC5kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2 +ttq+waOK+BLlenOiV+GODtgoE6t9Krw7IExQOAbrbOlamKDv77EJiUrdVBK+PWqA +JPqgBUu/a4SwmkqP8udCCykiV0rEfIWdR371HGU8eNWcCkcq4C73Ji3zdoGS6YUf +vTdy88DCi12677QbDB9Bs9kQ0BsCwWRfLaBSp4MuL9tBtnZGue84EWzCpFs2Rq9u +4PFot2FyYGXHSlDxTFg7Lg4gpXUjcVcvV2GeiKGUVYTtpmBk7cmcXMlZk04apU5h +lQXGnPvzuy8hHK1eiVGdRUeVDbNv6GLcydPG3nPUEa1tLTMaZJN9S82XGxuV/ciY +LPc20RJD8NyR0CYrSRHnAgMBAAGjggJYMIICVDAOBgNVHQ8BAf8EBAMCBaAwHQYD VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O -BBYEFAD2AZX730UKs0EzHlRBipv3agDQMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJ +BBYEFG5wjXqXqy3PVcxiFpKZPdhhprF3MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJ 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 +aHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggECBgorBgEEAdZ5AgQCBIHzBIHw +AO4AdQBGpVXrdfqRIDC1oolp9PN9ESxBdL79SbiFq/L8cP5tRwAAAYEeV1DnAAAE +AwBGMEQCIGfKuTe4WjI2AasZ2T2VLIBNkW8pBBnyBUPrA/CXLNgwAiBVu+VDD7nw +x3ElosrgfLZ169tIvGDp+s0MCt5UHhUMjQB1AN+lXqtogk8fbK3uuF9OPlrqzaIS +pGpejjsSwCBEXCpzAAABgR5XUrsAAAQDAEYwRAIgf7tY0XiicO+iO0QGRSof2gCj +Y0BqhcHK1NmmlXWjGIMCIE+5qMSxVJQoGsrbYfv8HzdU4MUJRuC2vsGC9JjpCJ7a +MA0GCSqGSIb3DQEBCwUAA4IBAQBjIaBoWbTzG5dhNi5zjRC7PlSRJOg9Mvb9WJeQ +zYkZohcur7wrKUjiIBeqvv+Z1QiUlG/4AmYCK7kWSPfHpmmx2AS2sjOrZOzRutKY +nh8Q8ID+WFsiLmU3OaDRa8/JKKQ5aHItxM0Yx63FE/90WqM7oTpwipwVcaaGuSnj +u3nKddn23DXwySqI4R/lF3CNhU9DdNQ6pg6/1rkgcbbXTHdDyRA0D8gbzErTXa7G +fk4NtsMp0u7OTCdTLO0f2AhKGkBY5p2vX7uNEshvqPXQ1rMfS4wQhHxp5eE6hB4E +9pGxqkR9mJANyktTC00Cq3nS1+yJ7S0nTBxv9MViSevgPy/8 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw diff --git a/certs/privkey.pem b/certs/privkey.pem index 3330a8d..28b7e01 100644 --- a/certs/privkey.pem +++ b/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -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 +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC2ttq+waOK+BLl +enOiV+GODtgoE6t9Krw7IExQOAbrbOlamKDv77EJiUrdVBK+PWqAJPqgBUu/a4Sw +mkqP8udCCykiV0rEfIWdR371HGU8eNWcCkcq4C73Ji3zdoGS6YUfvTdy88DCi126 +77QbDB9Bs9kQ0BsCwWRfLaBSp4MuL9tBtnZGue84EWzCpFs2Rq9u4PFot2FyYGXH +SlDxTFg7Lg4gpXUjcVcvV2GeiKGUVYTtpmBk7cmcXMlZk04apU5hlQXGnPvzuy8h +HK1eiVGdRUeVDbNv6GLcydPG3nPUEa1tLTMaZJN9S82XGxuV/ciYLPc20RJD8NyR +0CYrSRHnAgMBAAECggEAK7k4QXvPKhtRUk7qSwgitr8ApR6H5C0M3E1PVccCiOYI +NaDeqmw+fly3aJ2M2q+Rw9aVjyOVS9pr52MUwrvK8XgAQPKIttphkxCf5gIEi+MS +owOmojEBrC0bw+4w9boiHEVIdp60GxoEtQ5VmD9fX3atVCOowxEKduhRPFZPwwZT +IRHmzmZWG5XGoDd6CEKkhsCs6bYCRUnGsVCP4c3I4R7ejTndb9nl8+vGRBPNwf2Y +YIWaUEwEpjLmdp/gr28xye7AJEW7O/jCh8IkdZWshD5MyTYYTJr6eHdbF63dktSm +olXa3j8YF5Ow+a5SS7fCBIRLyFkH9v6t748/2JtdSQKBgQDiPcvgq3G4ARGck4OO +ePFvIPBqJHStMpnWKCSjucvb9pVuWK9bGzq2yPgjXn+FJ1ks3QNNgl9a/ga0yXI1 +3tKCVxygnh20ors6L6ZfPe9ujhIf8aZa8WnX+0n62odKyGm7ZKf3bj9zhJhsfjDZ +RoCc12G2ID+cxFbKOCnW2qUSwwKBgQDOv1+09XugSja88FzqMPksoNfFb6pwjRUg +OrBTDoDAc8692OXyb6Y7n0N5V+IJFfnn43yeVmXvQn3mDI6adOy3B9VbEehcQ6GM +46yX4YZ6DV/lld+f4ZsCYJR4lPZCraEp5GezYvvvdrRh3/EIm0tCHJd4tTO9vtQF +WlULl26KDQKBgE2hlsvJCIRzGW/4zjOdHHtdeiFx0Pd9XXw22hu0LVeVDUGH/OPu +O/9shnjcfDVcgyT50aBPFBlNAVAXr7D8fI9tBM24c8j/7e7RWu1jez0cUuvTJ5od +LIyIFaKWScZHbsB2kYw9sFgbL5JK2sgzgP5QiZ7NAgbw+Db7fp/S9sGxAoGAGjWA +eHw2M9e0oLcH0Fhs/g9Vyx2gyavY5cEK4TyRbdRAfSil3dnxhNVnxFYzvVsf1xmr +jpb9TRtswmENIt93sqw3i9f1UNzx+d5S3t4kIgzX/07EjowXDnIX4EFiBonkSF9A +FimSLoUp0M6Gy8SEAdmGCjNOX9t1HUiaR2HnDXECgYEAwhEqnngd3binvbYbc4DT +z+GznBI1MIctKDSOnk2gp5R8hcT3ri5LmMNSfns/hwN/8yzPYQ/s0/Ol9QZm0FTt +5zVtoKnzw7AC0Z3U+5On1gaqQreBn01bP9Gb0t1eAGueTg+Ckvsxp3+v953mkiub +z2uKsMVb1XQpcyBu5EU+TIM= -----END PRIVATE KEY----- From efccaaed6b7d23be5098c70033d6cf34505ec946 Mon Sep 17 00:00:00 2001 From: Ilya Date: Wed, 8 Jun 2022 10:27:20 +0300 Subject: [PATCH 2/5] init (#28) Co-authored-by: WizaXxX --- README.md | 10 +++++-- images/core/Dockerfile_20 | 37 +++++++++++++++++++++++++ images/core/get_platform.sh | 5 ---- images/core/get_platform_from_20_ver.sh | 6 ++++ images/core/get_platform_to_19_ver.sh | 4 +++ install.py | 26 +++++++++++++++-- modules/core.py | 15 ++++++---- 7 files changed, 86 insertions(+), 17 deletions(-) create mode 100644 images/core/Dockerfile_20 delete mode 100644 images/core/get_platform.sh create mode 100644 images/core/get_platform_from_20_ver.sh create mode 100644 images/core/get_platform_to_19_ver.sh diff --git a/README.md b/README.md index b0f774a..690442f 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,10 @@ sudo usermod -aG docker ${USER} - [Менеджер сервиса. Версия 1.0.94.20](https://releases.1c.ru/version_file?nick=FreshPublic&ver=1.0.28.1&path=SM\1_0_94_20\SM_1_0_94_20_setup1c.exe "Менеджер сервиса. Версия 1.0.94.20") - [Агент сервиса. Версия 1.0.29.4](https://releases.1c.ru/version_file?nick=FreshPublic&ver=1.0.28.1&path=SA\1_0_29_4\SA_1_0_29_4_setup1c.exe "Агент сервиса. Версия 1.0.29.4") - [Менеджер доступности. Версия 1.0.3.4](https://releases.1c.ru/version_file?nick=FreshPublic&ver=1.0.28.1&path=AM\1_0_3_4\AM_1_0_3_4_setup1c.exe "Менеджер доступности. Версия 1.0.3.4") -- [1С:Библиотека технологии сервиса, редакция 1.2. Версия 1.2.2.26](https://releases.1c.ru/version_files?nick=SMTL12&ver=1.2.2.26 "1С:Библиотека технологии сервиса, редакция 1.2. Версия 1.2.2.26") +- [1С:Библиотека технологии сервиса, редакция 1.2. Версия 1.2.2.26](https://releases.1c.ru/version_files?nick=SMTL12&ver=1.2.2.26 "1С:Библиотека технологии сервиса, редакция 1.2. Версия 1.2.2.26") + +##### Для версий платформ начиная с 8.3.20 +Необходимо так же [скачать](https://releases.1c.ru/project/EnterpriseLicenseTools) и разместить архив с утилитой лицензирования в каталог `/docker_fresh/distr/` ## 1. Подготовка к развертыванию @@ -93,9 +96,10 @@ cd docker_fresh Сборка образов запускается командой ```bash -sudo python3 install.py +sudo python3 install.py -v 8.3.15.1869 ``` -**install.py** имеет возможность запуска с флагом **-debug**. При запуске с данным флагом весь процесс сборки будет подробно отображаться на экране. +**install.py** имеет возможность запуска с флагом **-debug**. При запуске с данным флагом весь процесс сборки будет подробно отображаться на экране. +**-v** необходимо указать номер версии платформы дистрибутивы который вы скачали ## 2. Настройка лицензирования diff --git a/images/core/Dockerfile_20 b/images/core/Dockerfile_20 new file mode 100644 index 0000000..d13f30a --- /dev/null +++ b/images/core/Dockerfile_20 @@ -0,0 +1,37 @@ +FROM fresh/centos + +ARG DISTR_VERSION + +ADD ./distr/setup-full-$DISTR_VERSION-x86_64.run /tmp/core/ +ADD ./distr/license /tmp/core/license +ADD ./distr/*.rpm /tmp/core/ + +RUN yum -y localinstall /tmp/core/*.rpm ;\ + sed -i '/User apache/ s//User usr1cv8/g' /etc/httpd/conf/httpd.conf ;\ + sed -i '/Group apache/ s//Group grp1cv8/g' /etc/httpd/conf/httpd.conf ;\ + sed -i '/#ServerName www.example.com:80/ s//ServerName localhost/g' /etc/httpd/conf/httpd.conf ;\ + yum -y install x11vnc metacity net-tools gdb perl tar git jq ca-certificates ;\ + 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 iproute ;\ + /tmp/core/setup-full-$DISTR_VERSION-x86_64.run --mode unattended --enable-components client_full,server,ws,ru,uk ;\ + chmod +x /tmp/core/license/1ce-installer-cli; /tmp/core/license/1ce-installer-cli install --ignore-signature-warnings ;\ + update-ca-trust ;\ + rm -rf /tmp/core ;\ + oscript /usr/share/oscript/lib/opm/src/cmd/opm.os install deployka ;\ + chmod +x /usr/bin/deployka + +ENV COREDATA /var/lib/1c/data +ENV CORELOGS /var/log/1c +ENV AGENTBASEDIR /var/lib/1c/agent_data +ENV INFOBASECONNECTIONSTRING "" + +VOLUME ["${COREDATA}", "${CORELOGS}", "${AGENTBASEDIR}"] + +ADD ./entrypoint.sh / +RUN chmod +x /entrypoint.sh + +ADD ./dumper.py /usr/bin/dumper +RUN chmod +x /usr/bin/dumper + +ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/images/core/get_platform.sh b/images/core/get_platform.sh deleted file mode 100644 index 9b3c5fd..0000000 --- a/images/core/get_platform.sh +++ /dev/null @@ -1,5 +0,0 @@ -cd /out_files - - tar -xvf client*.rpm64.tar.gz --exclude "*thin*.rpm" --exclude "*nls*.rpm" --exclude "license-tools" -C /main_dir/distr - tar -xvf rpm64_*.tar.gz --exclude "*crs*.rpm" --exclude "*nls*.rpm" -C /main_dir/distr - diff --git a/images/core/get_platform_from_20_ver.sh b/images/core/get_platform_from_20_ver.sh new file mode 100644 index 0000000..22d6144 --- /dev/null +++ b/images/core/get_platform_from_20_ver.sh @@ -0,0 +1,6 @@ +cd /out_files + +tar -xvf server64*.tar.gz -C /main_dir/distr + +mkdir /main_dir/distr/license +tar -xvf *license_tools*.tar.gz -C /main_dir/distr/license \ No newline at end of file diff --git a/images/core/get_platform_to_19_ver.sh b/images/core/get_platform_to_19_ver.sh new file mode 100644 index 0000000..a8bd4d6 --- /dev/null +++ b/images/core/get_platform_to_19_ver.sh @@ -0,0 +1,4 @@ +cd /out_files + +tar -xvf client*.rpm64.tar.gz --exclude "*thin*.rpm" --exclude "*nls*.rpm" --exclude "license-tools" -C /main_dir/distr +tar -xvf rpm64_*.tar.gz --exclude "*crs*.rpm" --exclude "*nls*.rpm" -C /main_dir/distr diff --git a/install.py b/install.py index ffec850..85b47ea 100644 --- a/install.py +++ b/install.py @@ -27,15 +27,23 @@ def image_exist(image_name): return full_image_name in str(result.stdout) +if '-v' not in sys.argv: + print('parameter -v not specified') + exit(1) +else: + platform_ver = sys.argv[sys.argv.index('-v') + 1] +is_new_path_to_platform = int(platform_ver.split('.')[2]) >= 20 + images = [] images.append(centos.New()) images.append(db.New()) images.append(site.New()) images.append(forum.New()) -images.append(core.New()) +images.append(core.New(is_new_path_to_platform)) images.append(gate.New()) debug = '-debug' in sys.argv + start_time = datetime.now() print('{}Build is starting{}'.format(colors.GREEN, colors.WHITE)) @@ -54,8 +62,20 @@ for image in images: if debug: print(command) subprocess.call(' '.join(command), shell=True, stdout=stdout, stderr=stderr) - result = subprocess.run(['docker', 'build', '-t', 'fresh/' + image.name, 'images/' + image.name], - stdout=stdout, stderr=stderr) + command_to_run = [ + 'docker', + 'build', + '-t', + 'fresh/' + image.name] + + if image.name == 'core' and is_new_path_to_platform: + command_to_run.append('-f') + command_to_run.append('images/' + image.name + '/Dockerfile_20') + command_to_run.append('--build-arg') + command_to_run.append('DISTR_VERSION=' + platform_ver) + command_to_run.append('images/' + image.name) + + result = subprocess.run(command_to_run, stdout=stdout, stderr=stderr) if result.returncode != 0 or not image_exist(image.name): print('Building', image.name , '...', '{}error'.format(colors.RED), colors.WHITE) diff --git a/modules/core.py b/modules/core.py index 9a9fa4d..4e3a86c 100644 --- a/modules/core.py +++ b/modules/core.py @@ -9,20 +9,23 @@ def download_onescript(): command.append('https://oscript.io/downloads/1_4_0/x64/onescript-engine-1.4.0-1.fc26.noarch.rpm') return command -def unzip_platform_distr(): +def unzip_platform_distr(is_new_path_to_platform): command = helper.new_docker_command() command.append('-v') command.append(helper.this_path + helper.replace_sep('images/core') + ':/main_dir') command.append('alpine') command.append('sh') - command.append('/main_dir/get_platform.sh') + if is_new_path_to_platform: + command.append('/main_dir/get_platform_from_20_ver.sh') + else: + command.append('/main_dir/get_platform_to_19_ver.sh') return command -def add_all_before_commands(): +def add_all_before_commands(is_new_path_to_platform): commands = [] commands.append(download_onescript()) - commands.append(unzip_platform_distr()) + commands.append(unzip_platform_distr(is_new_path_to_platform)) return commands def delete_core_distr_files(): @@ -49,7 +52,7 @@ class New(): commands_before = [] commands_after = [] - def __init__(self): + def __init__(self, is_new_path_to_platform): self.name = 'core' - self.commands_before = add_all_before_commands() + self.commands_before = add_all_before_commands(is_new_path_to_platform) self.commands_after = add_all_after_commands() \ No newline at end of file From b7af542dbdf5b37c64620b7e33248d6360f8779a Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Tue, 12 Jul 2022 17:12:40 +0500 Subject: [PATCH 3/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D1=83=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20pos?= =?UTF-8?q?tgres?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/db/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/db/Dockerfile b/images/db/Dockerfile index a5591b4..b029232 100644 --- a/images/db/Dockerfile +++ b/images/db/Dockerfile @@ -3,7 +3,7 @@ FROM fresh/centos ADD ./entrypoint.sh / RUN localedef -f UTF-8 -i ru_RU ru_RU.UTF-8 \ - && yum install -y http://1c.postgrespro.ru/pg1c-9.6/keys/postgrespro-1c-9.6.centos.yum-9.6-0.3.noarch.rpm \ + && yum install -y http://repo.postgrespro.ru/pg1c-9.6/keys/postgrespro-1c-9.6.centos.yum-9.6-0.3.noarch.rpm \ && yum makecache \ && yum -y --setopt=tsflags=nodocs install postgresql-pro-1c-9.6 --nogpgcheck \ && chmod +x /entrypoint.sh From a668be06755163121dbeedd13002b073fe818e49 Mon Sep 17 00:00:00 2001 From: Ilya Date: Fri, 14 Oct 2022 09:29:33 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=90=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=81=D0=B5=D1=80=D1=82=D0=B8?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D0=B2=20(#29)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Исправление ссылки для скачивания posgres #28 (#29) * renew sert * renew sert * renew sert --- certs/fullchain.pem | 42 ++++++++++++++++++------------------ certs/privkey.pem | 52 ++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/certs/fullchain.pem b/certs/fullchain.pem index eecf89d..1ed40a6 100644 --- a/certs/fullchain.pem +++ b/certs/fullchain.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFMjCCBBqgAwIBAgISA/Z9RcWrlHykZeh2qxdOmnCWMA0GCSqGSIb3DQEBCwUA +MIIFMjCCBBqgAwIBAgISBAIMat8DNTbmopOM7VVmeBxjMA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yMjA3MTEwNzMxNTdaFw0yMjEwMDkwNzMxNTZaMBgxFjAUBgNVBAMM -DSouMWNmcmVzaC5kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCy -gbLzYQ6UUn1vt8VKSH6Erh2Qb3WtEFmjC5YGgPueXwHIrViYsiSXtOq/6CBox4F/ -WUOT+7C9Bn/1TUevDoT6iIB/xuRmGXnFvx3RWZ0c9UTlcjjqGj6SgzIdxkew20bw -7EUVSjytX/Wqrox4rODtIEhNPRRVX8XhUao5bUomgh/dmHJi9fMSsqLrqZVZonu5 -ZkdPGwH2spZmpDgowlsRCfB+KMLtnaIbPk13IvEJsB+RFDKRBGIderuSPwShoKL2 -G2gChJcCm2LfyObns6nEiMQicruDakYhSZAK+MBkEdsrqnC2uzvHLm8rMx3RNajY -aStgIliiK7OptfS5zM+dAgMBAAGjggJaMIICVjAOBgNVHQ8BAf8EBAMCBaAwHQYD +EwJSMzAeFw0yMjEwMDEwNzA1MDdaFw0yMjEyMzAwNzA1MDZaMBgxFjAUBgNVBAMM +DSouMWNmcmVzaC5kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ +X7MMj1d2IMBjEkgd6oWhPW0dZIJQJw7uACtro8XJ/7On83MVm3aXoY3xEzPNVsPO +l+qaSbCT4mJIHa4ugrW5pk4db9tCYhC0jcGM6Co1l6K8zJB1egZ0pXCh8vGpGZEy +/kNMemg+s/9UM+V8FeY3pWANC37Cx/CXqoathcJdye22V2x3I04OI4GYTk6KppJO +zPLAHzeAWUbuYNZkaHqAof665jFCI4GfhAPY+DppUB9fafS4bxwb2YkbdmQ3uNsW +8g3xe4xwIOERmL1GwgXof1rNM2cbAuPhm0Jh2LXwZ3Wfn/m1T6l4KOmFV2RYbDrQ +J+T1RZEYCrHh46vz3gTdAgMBAAGjggJaMIICVjAOBgNVHQ8BAf8EBAMCBaAwHQYD VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O -BBYEFAGxzZH+vBAnhWx/K7hvDQZPFFA7MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJ +BBYEFL2elwfHhq622hJR5GbjBW/L1uaTMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJ QOYfr52LFMLGMFUGCCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3Iz Lm8ubGVuY3Iub3JnMCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcv MCoGA1UdEQQjMCGCDSouMWNmcmVzaC5kZXaCECouczMuMWNmcmVzaC5kZXYwTAYD VR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYa aHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEEBgorBgEEAdZ5AgQCBIH1BIHy -APAAdQBGpVXrdfqRIDC1oolp9PN9ESxBdL79SbiFq/L8cP5tRwAAAYHsYvZlAAAE -AwBGMEQCIAOo6HneiI9KWNdg8ga+xqnJW67oDlu0DjSX+rP+27/tAiBLh/aC/XGp -6SaojLFdwkRlVjXzXWMM0H+Yb6kUE04u+QB3AG9Tdqwx8DEZ2JkApFEV/3cVHBHZ -AsEAKQaNsgiaN9kTAAABgexi9y8AAAQDAEgwRgIhAPtswSIYmrKFiKyu1Bb0N4JN -r7GHYLFI1ks8MOq9nLVAAiEAomSZw3TpO9bHcTsD5tDFIvxPU0S2q0kgmtk2S6Mx -EiAwDQYJKoZIhvcNAQELBQADggEBAFeqXbiJahW/5cU4eERDGc8bHE5N1/GWfSuu -GSdx7GOyL1NWQcwFx+4CYvswLgMg1Ax4+WXwzIyufDCLqdw2mI91vgDGbhWi1eMw -ncpCKd+qKVT/5/VCpman9a2wcZtoe/NuUZC1523bKu2MpDouSGI7x8lXKgXvxjkV -wAVAh0CQdiDSDIKU7OR8+jZ+W7wN9YgFtNes2M4piWNzPsPMITQtKmrGNo/k15jt -VE09ZJwXU7eKpk78NYoizChkwIsCYEAyhzOfwUffBOXEcGM3FHNkpDW9GqUW/caS -llyINol3zHOPxQl1TebfwiEfLYHdt0ZF8eyVz9wUcMnqc5HVcUs= +APAAdwBGpVXrdfqRIDC1oolp9PN9ESxBdL79SbiFq/L8cP5tRwAAAYOSk92uAAAE +AwBIMEYCIQDa30Vn0qIlKE0QdtJ/9cHS4nY6h3/S6aPsqEvHrJhsfwIhAMbsnuw/ +pl40Bgqg7TXXr0QTQu73HOBzzpHRecMO2HICAHUAQcjKsd8iRkoQxqE6CUKHXk4x +ixsD6+tLx2jwkGKWBvYAAAGDkpPfggAABAMARjBEAiBxC9lm9Z+ODgzvRdDvWtot +AVOBOGj6nXRSp0CFwf0iggIgAOwhu9vFgQ1PYgIf3PMSTf6V0x5PIeOWDJr3fopt +h/wwDQYJKoZIhvcNAQELBQADggEBALipY8ShyhswPhdWUyilvSiWhEt5SiQaJV4M +oPb+PLMgv00XVKmUKqudKcMHxj8dGrzzpLZ9PY51dE5beH8PsDqfaZgvDe+Mn48J +rnmxCEW6+8b/pARfezAnd6cT/KRdgZbw6O0zuvxWxcAEdlkpMnS3rD0PH6tcKVu/ +L1JQzIMWXCxnC8Ympc2yI9LOyBDfJTlfRGMl1ueUtqLKQRcD2CrM2laf+V5oCVUF +6lOpE+DFJy+Ks9ddpiNdQ4oGir8sIPBL4DIEMUiG2E5HK0qpt0A45eM/sahsh8BP +ktdn+TCk/FHjAH03FSv+iwwX1qyCoPdmQ635bRnl1qABEpX1v9Q= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw diff --git a/certs/privkey.pem b/certs/privkey.pem index 2cf830e..f621d68 100644 --- a/certs/privkey.pem +++ b/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCygbLzYQ6UUn1v -t8VKSH6Erh2Qb3WtEFmjC5YGgPueXwHIrViYsiSXtOq/6CBox4F/WUOT+7C9Bn/1 -TUevDoT6iIB/xuRmGXnFvx3RWZ0c9UTlcjjqGj6SgzIdxkew20bw7EUVSjytX/Wq -rox4rODtIEhNPRRVX8XhUao5bUomgh/dmHJi9fMSsqLrqZVZonu5ZkdPGwH2spZm -pDgowlsRCfB+KMLtnaIbPk13IvEJsB+RFDKRBGIderuSPwShoKL2G2gChJcCm2Lf -yObns6nEiMQicruDakYhSZAK+MBkEdsrqnC2uzvHLm8rMx3RNajYaStgIliiK7Op -tfS5zM+dAgMBAAECggEBAISHmOXrTFjAudKE/Rw+oHg/kUGYDyUze2l7A6LGhom5 -feiRErMjp9lef9+FJvLEFJgJHQw0lK5ysfPcsXj97arYR5cWgqJvDaLMVwYEY4qJ -auJzIGBmpcg/UakbekSLOKtMr6mz2ULbeNiFCVPa/o/vJN77lyoflhnIePpz8taN -DJXc/4MyEdUoa+h8QG2x9Et1M3ZZLBXuluNqnHtf2d1d8HZpM73dWv0O3uFzSefu -NtgStTkQyGm8b7DgznLZBYNqR0gQMUZBEBSCq2Mcn1/qOlNW1dWd7pqOWv75ZECK -BIecpF36Gfqj/bqI08NMtYMHuPRPb6pF/N/cTEX8tv0CgYEA7Ua8YxMq8fjItt6k -S4Srgc81S5PdSWTuuKqdGxjuuM0gXKI3V2IXSqxHE83MBJSHiwYwF9nKBnOdaOi/ -dtRVTzbzja75HFIW26F0SqokouZ0L5Gb1hCqQQoloyauGGrO4cJ7OBKypHAc4RxX -43VLxfIonNtNv7WsdXHSyTWSMP8CgYEAwJe+5kx2+xt9piecS0ILsKogfVCXQCR7 -5GqUdvOXu4Nhd9iWjRHd5Vr5NC1wmi9soveyjTwbmQ4dUGdBcTwbDXlm9sXCpHTv -zglp2c3nJr+OalnqajRo8aMAj6YgicDGUUWHEHj7pK8mAkyBbRvq7y+cCQyvqbw5 -7KRxejlvI2MCgYAmUNDlEthRgMIwvZ08UK09Zg+OJ8+JJZJjIbIDCTCriPxb2Rok -s0NdnJpRuV7jsnR837/uag30osDdixA4CSvJge8shv/VMfBdASJ9WCJYZ+yFLfdD -RyenHxNa2EkuyjikPjqVoHdWlIAlXeVXZr6YtXUXd1aDybuSr5HBSjRUUwKBgDOd -d5AJFioeKAKLwxt4S+HA9owfOSn7nSiOV9O5XQToJQsVhOOx0iJRy0/sja0E4Lyc -XcH0RgEzAzA1PBi43xcxXiLsxUmF/W7envu8byK3W9es2WI1QZrg8JmPEFFa1Mub -MqN7iRWNy0X6cwVm4gPQYqUaPUnkJDIDsFXtZpe5AoGAXaUbv0urBaLUoaJdR3Qp -BVrI6egUKfUAxCSn3YvxTuzsZwtq2DrMQOy13gGAeEbGn0EtEHToBRPfV4do4AGi -2gPJuvYOFYVcs33YGfG+sqe1EW/p1wwWRL7E+6k66PzPXhpDj2MqfDH4M8BAUYt/ -v+pGefs5eMQaHDZOYzHd76k= +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDJX7MMj1d2IMBj +Ekgd6oWhPW0dZIJQJw7uACtro8XJ/7On83MVm3aXoY3xEzPNVsPOl+qaSbCT4mJI +Ha4ugrW5pk4db9tCYhC0jcGM6Co1l6K8zJB1egZ0pXCh8vGpGZEy/kNMemg+s/9U +M+V8FeY3pWANC37Cx/CXqoathcJdye22V2x3I04OI4GYTk6KppJOzPLAHzeAWUbu +YNZkaHqAof665jFCI4GfhAPY+DppUB9fafS4bxwb2YkbdmQ3uNsW8g3xe4xwIOER +mL1GwgXof1rNM2cbAuPhm0Jh2LXwZ3Wfn/m1T6l4KOmFV2RYbDrQJ+T1RZEYCrHh +46vz3gTdAgMBAAECggEAAo1GaRXV72bJ2VeNd2eV6u2q2NEBv79G9qgk5LfOFVm6 +rpmsryzpq1E+SbxLD0KWt6MAM5VUegNH6I8LuoYohGJBoijdN/GjMY6MUdtNUaGK +y+axu/NgapEAJOU9v71VtDY5pxn0ATtptGj18wUaBkF/vpqTMCe1ek6MZ12HEYYs +SM2kW2lEuUOYqZtbLhdwwrEkneoL+e3xTW5pv91v5FXl3pO7+KH83MaQFcv1APx9 +OWiAgGBdUpQKDJvJbFJzl7h/1EtozH3OwwKDKViEkam0/FEwvk0wIfsn5phC4V5X +LD8mBzCROd4jR4r15MVNyMXtYCdcZixBNXIWHqImcQKBgQDQNUwNXoSmel9pSZud +yz+O8w9qhNA98VGz7mQFfEYV4kYcALGbmUBR0vMazS7uKRSyAsE0nz2lxPSkZ4U9 +hmHe8XJ/0JSj/ck25Yry6dR8mYSVkmURtgd990BuI6bOeXptDo1p2J3pohmrq5k0 +ktSLcdeU4/ZuYX5voIU3ldP/2QKBgQD3mM1dOvNhmEqDg91yzlC18oDdwLq9xBLA +98Cm5joz/EkE81p79kU2CXfUvrYYBTRtPU1h91PFRMAEtxMz6fEin9gpPaZNHsY/ +a59ihvLNh5y1gGpxSxw/LZ43utTSJ8rOIHaA9j/gr0Mi0ru9fqJ07oIz/fiAaPng +ohFfVrZOpQKBgGKkLYDT+9KHfXZ7Wg+bAGSwQOh9Pc9q6gNt+NMkemvZxM91gK+w +HmnloClddlN9AQIJDhHpM6K6uhC9vsFUTj/6cf2eCx3amZ65h2foYjQZ41edgOaw +L8J9BnhnyZpesSLD1zmDV+UdWD4d0Tq4KZxa9gDjM5g99lHaYeLgyAyZAoGANbYf +Ls9gBtbrqzYK7yHUnnPaAsERgaMsUlIsp8gf7jEXggxsn6GgCAXryeoJRJK0edIn +nE30DUJJyXwRnVxtpA467U9jaS144j8tl0khGPcHRtRxwtwBZ680uHA+RMy/ERI3 +wugomUxL6xz9/zCee3FWK4M3ylt7gYCG9kCwUcUCgYBOqmHq/I5tCqFgig5aRT+O +l7j11MsDJCf/Irz3GSVVwR8j3iFxX4LyJ0ZCeHz6u1dG/KlyiiMaxLGOJn/Oei3F +DpIjN6rVJxTYw9I2PQHlssd6koFnbDUhTZiQ8EQ22oxBwLJ/9v7G4mOflYfHs+Wc +UVLjQTL4LniAW/fB00K/+Q== -----END PRIVATE KEY----- From d4c9361cf908dcc8095b226e8e2ba29ceef808e3 Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Fri, 14 Oct 2022 12:41:17 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=B2=D0=B5=D1=80=D1=82=D0=BA=D0=B8=20=D1=81=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=BC=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/gate/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images/gate/Dockerfile b/images/gate/Dockerfile index 9b7f0c9..100f438 100644 --- a/images/gate/Dockerfile +++ b/images/gate/Dockerfile @@ -1,9 +1,13 @@ -FROM java:8-jre +FROM openjdk:8-jre-buster COPY ./distr/appgate.deb / RUN dpkg -i /appgate.deb; \ rm /appgate.deb; \ + echo export PATH=$PATH:/usr/local/openjdk-8/bin > /etc/profile.d/add_java.sh ;\ + chmod +x /etc/profile.d/add_java.sh ;\ + echo export PATH=$PATH:JAVA_HOME=/usr/local/openjdk-8 > /etc/profile.d/add_java_home.sh ;\ + chmod +x /etc/profile.d/add_java_home.sh ;\ /opt/1C/1cfresh/appgate/setAuth.sh appgate 12345Qwer EXPOSE 8080 9090