From 0834343cba84a18c5245703a35cb63b9c3bd3e2a Mon Sep 17 00:00:00 2001 From: STAM Date: Fri, 27 Mar 2020 15:11:32 +0300 Subject: [PATCH] php hotfix; atlassian sdk hotfix --- balancer/php/Dockerfile | 93 +++++++++++++++++----------------- teamcity-agent/Dockerfile | 43 +++++++++------- websites/latest/Dockerfile | 100 ++++++++++++++++++------------------- 3 files changed, 121 insertions(+), 115 deletions(-) diff --git a/balancer/php/Dockerfile b/balancer/php/Dockerfile index d581153d5..60a1e1083 100644 --- a/balancer/php/Dockerfile +++ b/balancer/php/Dockerfile @@ -12,49 +12,45 @@ RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg apache2-utils \ libmemcached-dev \ sendmail \ - php7.3-gmp \ - php7.3-snmp \ - php7.3-ldap \ - php7.3-dev \ - php7.3 \ - php7.3-mail \ - php7.3-mailparse \ - php7.3-soap \ - php7.3-mysql \ - php7.3-memcached \ - php7.3-memcache \ - php7.3-igbinary \ - php7.3-curl \ - php7.3-gd \ - php7.3-intl \ - php7.3-zip \ - php7.3-bcmath \ - php7.3-fpm \ - php-pear \ - php7.3-imap \ - php7.3-pspell \ - php7.3-recode \ - php7.3-sqlite3 \ - php7.3-tidy \ - php7.3-xmlrpc \ - php7.3-xml \ - php7.3-mbstring \ - php7.3-gettext \ - php7.3-apcu \ - php7.3-cli \ - php7.3-common \ - php7.3-cgi \ - php7.3-json \ - php7.3-readline \ - php7.3-enchant \ - php7.3-ssh2 \ - php7.3-oauth \ - php7.3-gmagick \ - php7.3-gnupg \ - php7.3-redis \ - php7.3-smbclient \ - php7.3-yaml \ - php7.3-geoip + php-gmp \ + php-snmp \ + php-ldap \ + php7.4-dev \ + php7.4 \ + php-mail \ + php-soap \ + php-mysql \ + php-mailparse \ + php-memcache \ + php-memcached \ + php-curl \ + php-gd \ + php-intl \ + php-zip \ + php-bcmath \ + php-fpm \ + php-imap \ + php-pspell \ + php-sqlite3 \ + php-tidy \ + php-xmlrpc \ + php-xml \ + php-mbstring \ + php-gettext \ + php7.4-cli \ + php-common \ + php-cgi \ + php-json \ + php-readline \ + php-enchant \ + php-ssh2 \ + php-oauth \ + php-gmagick \ + php-gnupg \ + php-redis \ + php-smbclient \ + php-yaml \ + php-geoip ################################################################## # Enabling php modules @@ -101,12 +97,12 @@ RUN phpenmod \ ################################################################## # ioncube support ################################################################## -ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +ADD https://www.ioncube.com/php-7.4.0-beta-loaders/ioncube_loaders_lin_x86-64_7.4_BETA2.tar.gz /tmp/ioncube.tar.gz RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ - cp /tmp/ioncube/ioncube_loader_lin_7.3.so /usr/lib/php/20170718/ && \ - echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/cgi/php.ini && \ - echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/cli/php.ini && \ - echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/fpm/php.ini && \ + cp /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so /usr/lib/php/20170718/ && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/cgi/php.ini && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/cli/php.ini && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/fpm/php.ini && \ php -v ################################################################## @@ -126,6 +122,7 @@ RUN apt clean -y && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ rm -rfv /tmp/composer-setup.php && \ + rm -rfv /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so && \ rm -rfv /tmp/ioncube.tar.gz #Final config diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile index ed581b21d..2d55ef5cc 100644 --- a/teamcity-agent/Dockerfile +++ b/teamcity-agent/Dockerfile @@ -23,7 +23,7 @@ RUN chmod +x /run-services.sh && \ sync ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip -RUN unzip /buildAgent.zip -d /opt/buildagent && \ +RUN unzip -q /buildAgent.zip -d /opt/buildagent && \ mv /opt/buildagent/conf /opt/buildagent/conf_dist && \ rm -rfv /buildAgent.zip @@ -142,11 +142,19 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1. ################################################################## #Install packages -RUN curl -fsSL https://packages.atlassian.com/api/gpg/key/public | apt-key add - && \ - echo 'deb https://packages.atlassian.com/debian/atlassian-sdk-deb/ stable contrib' > /etc/apt/sources.list.d/atlassian-sdk.list && \ - apt-get update && \ - apt-get install -y --no-install-recommends --allow-unauthenticated \ - atlassian-plugin-sdk +RUN curl -SL https://packages.atlassian.com/atlassian-sdk-deb/debian/pool/contrib/a/atlassian-plugin-sdk/atlassian-plugin-sdk_8.0.16_all.deb -o /tmp/atlassian-plugin-sdk.deb && \ + dpkg -i /tmp/atlassian-plugin-sdk.deb + +############################### +# https://community.atlassian.com/t5/Continuous-Delivery-questions/The-repository-https-packages-atlassian-com-atlassian-sdk-deb/qaq-p/1334014 +# +# https://community.developer.atlassian.com/t/the-repository-https-packages-atlassian-com-atlassian-sdk-deb-stable-release-is-not-signed/36901 +############################### +#RUN curl -fsSL https://packages.atlassian.com/api/gpg/key/public | apt-key add - && \ +# echo 'deb [trusted=yes] https://packages.atlassian.com/atlassian-sdk-deb stable contrib' > /etc/apt/sources.list.d/atlassian-sdk.list && \ +# apt-get update --allow-insecure-repositories && \ +# apt-get install -y --no-install-recommends --allow-unauthenticated \ +# atlassian-plugin-sdk ################################################################## # Installing PHP7 @@ -164,12 +172,12 @@ RUN apt-get update && \ php7.3-dev \ php7.3 \ php7.3-mail \ - php7.3-mailparse \ + php-mailparse \ php7.3-soap \ php7.3-mysql \ php7.3-memcached \ - php7.3-memcache \ - php7.3-igbinary \ + php-memcache \ + php-igbinary \ php7.3-curl \ php7.3-gd \ php7.3-intl \ @@ -186,21 +194,21 @@ RUN apt-get update && \ php7.3-xml \ php7.3-mbstring \ php7.3-gettext \ - php7.3-apcu \ + php-apcu \ php7.3-cli \ php7.3-common \ php7.3-cgi \ php7.3-json \ php7.3-readline \ php7.3-enchant \ - php7.3-ssh2 \ - php7.3-oauth \ - php7.3-gmagick \ - php7.3-gnupg \ - php7.3-redis \ + php-ssh2 \ + php-oauth \ + php-gmagick \ + php-gnupg \ + php-redis \ php7.3-smbclient \ - php7.3-yaml \ - php7.3-geoip \ + php-yaml \ + php-geoip \ sendmail && \ phpenmod \ snmp \ @@ -281,6 +289,7 @@ RUN apt clean -y && \ rm -rfv /tmp/deb/* && \ rm -rfv /tmp/composer-setup.php && \ rm -rfv /tmp/amxx_base_latest.tar.gz && \ + rm -rfv /tmp/atlassian-plugin-sdk.deb && \ rm -rfv /tmp/addons CMD ["/run-services.sh"] diff --git a/websites/latest/Dockerfile b/websites/latest/Dockerfile index cb0c8a007..76ff7211f 100644 --- a/websites/latest/Dockerfile +++ b/websites/latest/Dockerfile @@ -18,54 +18,53 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ apache2 \ apache2-utils \ - libapache2-mod-php7.3 \ + libapache2-mod-php7.4 \ libapache2-mod-webauth \ libapache2-mod-xforward \ libapache2-mod-security2 \ libmemcached-dev \ - php7.3-gmp \ - php7.3-snmp \ - php7.3-ldap \ - php7.3-dev \ - php7.3 \ - php7.3-mail \ - php7.3-mailparse \ - php7.3-soap \ - php7.3-mysql \ - php7.3-memcached \ - php7.3-memcache \ - php7.3-igbinary \ - php7.3-curl \ - php7.3-gd \ - php7.3-intl \ - php7.3-zip \ - php7.3-bcmath \ - php7.3-fpm \ + php7.4 \ + php7.4-dev \ + php7.4-fpm \ + php7.4-cli \ + php7.4-cgi \ php-pear \ - php7.3-imap \ - php7.3-pspell \ - php7.3-recode \ - php7.3-sqlite3 \ - php7.3-tidy \ - php7.3-xmlrpc \ - php7.3-xml \ - php7.3-mbstring \ - php7.3-gettext \ - php7.3-apcu \ - php7.3-cli \ - php7.3-common \ - php7.3-cgi \ - php7.3-json \ - php7.3-readline \ - php7.3-enchant \ - php7.3-ssh2 \ - php7.3-oauth \ - php7.3-gmagick \ - php7.3-gnupg \ - php7.3-redis \ - php7.3-smbclient \ - php7.3-yaml \ - php7.3-geoip \ + php-gmp \ + php-snmp \ + php-ldap \ + php-mail \ + php-mailparse \ + php-soap \ + php-mysql \ + php-memcached \ + php-memcache \ + php-igbinary \ + php-curl \ + php-gd \ + php-intl \ + php-zip \ + php-bcmath \ + php-imap \ + php-pspell \ + php-sqlite3 \ + php-tidy \ + php-xmlrpc \ + php-xml \ + php-mbstring \ + php-gettext \ + php-apcu \ + php-common \ + php-json \ + php-readline \ + php-enchant \ + php-ssh2 \ + php-oauth \ + php-gmagick \ + php-gnupg \ + php-redis \ + php-smbclient \ + php-yaml \ + php-geoip \ sendmail && \ phpenmod \ snmp \ @@ -106,7 +105,7 @@ RUN apt-get update && \ xsl \ yaml && \ a2enmod \ - php7.3 \ + php7.4 \ rewrite \ ldap \ heartmonitor \ @@ -130,13 +129,13 @@ RUN apt-get update && \ ################################################################## # Installing IOnCube addon ################################################################## -ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +ADD https://www.ioncube.com/php-7.4.0-beta-loaders/ioncube_loaders_lin_x86-64_7.4_BETA2.tar.gz /tmp/ioncube.tar.gz RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ - cp /tmp/ioncube/ioncube_loader_lin_7.3.so /usr/lib/php/20170718/ && \ - echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/apache2/php.ini && \ - echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/cgi/php.ini && \ - echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/cli/php.ini && \ - echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/fpm/php.ini && \ + cp /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so /usr/lib/php/20170718/ && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/apache2/php.ini && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/cgi/php.ini && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/cli/php.ini && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/fpm/php.ini && \ php -v ################################################################## @@ -156,6 +155,7 @@ RUN apt clean -y && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/deb/* && \ rm -rfv /tmp/composer-setup.php && \ + rm -rfv /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so && \ rm -rfv /tmp/ioncube.tar.gz #volumes