mirror of
https://github.com/EpicMorg/docker-scripts.git
synced 2024-12-26 06:35:40 +03:00
php hotfix; atlassian sdk hotfix
This commit is contained in:
parent
bc306dfa62
commit
0834343cba
@ -12,49 +12,45 @@ RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
|
|||||||
apache2-utils \
|
apache2-utils \
|
||||||
libmemcached-dev \
|
libmemcached-dev \
|
||||||
sendmail \
|
sendmail \
|
||||||
php7.3-gmp \
|
php-gmp \
|
||||||
php7.3-snmp \
|
php-snmp \
|
||||||
php7.3-ldap \
|
php-ldap \
|
||||||
php7.3-dev \
|
php7.4-dev \
|
||||||
php7.3 \
|
php7.4 \
|
||||||
php7.3-mail \
|
php-mail \
|
||||||
php7.3-mailparse \
|
php-soap \
|
||||||
php7.3-soap \
|
php-mysql \
|
||||||
php7.3-mysql \
|
php-mailparse \
|
||||||
php7.3-memcached \
|
php-memcache \
|
||||||
php7.3-memcache \
|
php-memcached \
|
||||||
php7.3-igbinary \
|
php-curl \
|
||||||
php7.3-curl \
|
php-gd \
|
||||||
php7.3-gd \
|
php-intl \
|
||||||
php7.3-intl \
|
php-zip \
|
||||||
php7.3-zip \
|
php-bcmath \
|
||||||
php7.3-bcmath \
|
php-fpm \
|
||||||
php7.3-fpm \
|
php-imap \
|
||||||
php-pear \
|
php-pspell \
|
||||||
php7.3-imap \
|
php-sqlite3 \
|
||||||
php7.3-pspell \
|
php-tidy \
|
||||||
php7.3-recode \
|
php-xmlrpc \
|
||||||
php7.3-sqlite3 \
|
php-xml \
|
||||||
php7.3-tidy \
|
php-mbstring \
|
||||||
php7.3-xmlrpc \
|
php-gettext \
|
||||||
php7.3-xml \
|
php7.4-cli \
|
||||||
php7.3-mbstring \
|
php-common \
|
||||||
php7.3-gettext \
|
php-cgi \
|
||||||
php7.3-apcu \
|
php-json \
|
||||||
php7.3-cli \
|
php-readline \
|
||||||
php7.3-common \
|
php-enchant \
|
||||||
php7.3-cgi \
|
php-ssh2 \
|
||||||
php7.3-json \
|
php-oauth \
|
||||||
php7.3-readline \
|
php-gmagick \
|
||||||
php7.3-enchant \
|
php-gnupg \
|
||||||
php7.3-ssh2 \
|
php-redis \
|
||||||
php7.3-oauth \
|
php-smbclient \
|
||||||
php7.3-gmagick \
|
php-yaml \
|
||||||
php7.3-gnupg \
|
php-geoip
|
||||||
php7.3-redis \
|
|
||||||
php7.3-smbclient \
|
|
||||||
php7.3-yaml \
|
|
||||||
php7.3-geoip
|
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
# Enabling php modules
|
# Enabling php modules
|
||||||
@ -101,12 +97,12 @@ RUN phpenmod \
|
|||||||
##################################################################
|
##################################################################
|
||||||
# ioncube support
|
# 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 && \
|
RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \
|
||||||
cp /tmp/ioncube/ioncube_loader_lin_7.3.so /usr/lib/php/20170718/ && \
|
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.3.so" >> /etc/php/7.3/cgi/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.3.so" >> /etc/php/7.3/cli/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.3.so" >> /etc/php/7.3/fpm/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
|
php -v
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
@ -126,6 +122,7 @@ RUN apt clean -y && \
|
|||||||
rm -rfv /var/cache/apt/archives/*.deb && \
|
rm -rfv /var/cache/apt/archives/*.deb && \
|
||||||
rm -rfv /tmp/deb/* && \
|
rm -rfv /tmp/deb/* && \
|
||||||
rm -rfv /tmp/composer-setup.php && \
|
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
|
rm -rfv /tmp/ioncube.tar.gz
|
||||||
|
|
||||||
#Final config
|
#Final config
|
||||||
|
@ -23,7 +23,7 @@ RUN chmod +x /run-services.sh && \
|
|||||||
sync
|
sync
|
||||||
|
|
||||||
ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip
|
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 && \
|
mv /opt/buildagent/conf /opt/buildagent/conf_dist && \
|
||||||
rm -rfv /buildAgent.zip
|
rm -rfv /buildAgent.zip
|
||||||
|
|
||||||
@ -142,11 +142,19 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
|
|||||||
##################################################################
|
##################################################################
|
||||||
|
|
||||||
#Install packages
|
#Install packages
|
||||||
RUN curl -fsSL https://packages.atlassian.com/api/gpg/key/public | apt-key add - && \
|
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 && \
|
||||||
echo 'deb https://packages.atlassian.com/debian/atlassian-sdk-deb/ stable contrib' > /etc/apt/sources.list.d/atlassian-sdk.list && \
|
dpkg -i /tmp/atlassian-plugin-sdk.deb
|
||||||
apt-get update && \
|
|
||||||
apt-get install -y --no-install-recommends --allow-unauthenticated \
|
###############################
|
||||||
atlassian-plugin-sdk
|
# 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
|
# Installing PHP7
|
||||||
@ -164,12 +172,12 @@ RUN apt-get update && \
|
|||||||
php7.3-dev \
|
php7.3-dev \
|
||||||
php7.3 \
|
php7.3 \
|
||||||
php7.3-mail \
|
php7.3-mail \
|
||||||
php7.3-mailparse \
|
php-mailparse \
|
||||||
php7.3-soap \
|
php7.3-soap \
|
||||||
php7.3-mysql \
|
php7.3-mysql \
|
||||||
php7.3-memcached \
|
php7.3-memcached \
|
||||||
php7.3-memcache \
|
php-memcache \
|
||||||
php7.3-igbinary \
|
php-igbinary \
|
||||||
php7.3-curl \
|
php7.3-curl \
|
||||||
php7.3-gd \
|
php7.3-gd \
|
||||||
php7.3-intl \
|
php7.3-intl \
|
||||||
@ -186,21 +194,21 @@ RUN apt-get update && \
|
|||||||
php7.3-xml \
|
php7.3-xml \
|
||||||
php7.3-mbstring \
|
php7.3-mbstring \
|
||||||
php7.3-gettext \
|
php7.3-gettext \
|
||||||
php7.3-apcu \
|
php-apcu \
|
||||||
php7.3-cli \
|
php7.3-cli \
|
||||||
php7.3-common \
|
php7.3-common \
|
||||||
php7.3-cgi \
|
php7.3-cgi \
|
||||||
php7.3-json \
|
php7.3-json \
|
||||||
php7.3-readline \
|
php7.3-readline \
|
||||||
php7.3-enchant \
|
php7.3-enchant \
|
||||||
php7.3-ssh2 \
|
php-ssh2 \
|
||||||
php7.3-oauth \
|
php-oauth \
|
||||||
php7.3-gmagick \
|
php-gmagick \
|
||||||
php7.3-gnupg \
|
php-gnupg \
|
||||||
php7.3-redis \
|
php-redis \
|
||||||
php7.3-smbclient \
|
php7.3-smbclient \
|
||||||
php7.3-yaml \
|
php-yaml \
|
||||||
php7.3-geoip \
|
php-geoip \
|
||||||
sendmail && \
|
sendmail && \
|
||||||
phpenmod \
|
phpenmod \
|
||||||
snmp \
|
snmp \
|
||||||
@ -281,6 +289,7 @@ RUN apt clean -y && \
|
|||||||
rm -rfv /tmp/deb/* && \
|
rm -rfv /tmp/deb/* && \
|
||||||
rm -rfv /tmp/composer-setup.php && \
|
rm -rfv /tmp/composer-setup.php && \
|
||||||
rm -rfv /tmp/amxx_base_latest.tar.gz && \
|
rm -rfv /tmp/amxx_base_latest.tar.gz && \
|
||||||
|
rm -rfv /tmp/atlassian-plugin-sdk.deb && \
|
||||||
rm -rfv /tmp/addons
|
rm -rfv /tmp/addons
|
||||||
|
|
||||||
CMD ["/run-services.sh"]
|
CMD ["/run-services.sh"]
|
||||||
|
@ -18,54 +18,53 @@ RUN apt-get update && \
|
|||||||
apt-get install -y --allow-unauthenticated \
|
apt-get install -y --allow-unauthenticated \
|
||||||
apache2 \
|
apache2 \
|
||||||
apache2-utils \
|
apache2-utils \
|
||||||
libapache2-mod-php7.3 \
|
libapache2-mod-php7.4 \
|
||||||
libapache2-mod-webauth \
|
libapache2-mod-webauth \
|
||||||
libapache2-mod-xforward \
|
libapache2-mod-xforward \
|
||||||
libapache2-mod-security2 \
|
libapache2-mod-security2 \
|
||||||
libmemcached-dev \
|
libmemcached-dev \
|
||||||
php7.3-gmp \
|
php7.4 \
|
||||||
php7.3-snmp \
|
php7.4-dev \
|
||||||
php7.3-ldap \
|
php7.4-fpm \
|
||||||
php7.3-dev \
|
php7.4-cli \
|
||||||
php7.3 \
|
php7.4-cgi \
|
||||||
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 \
|
php-pear \
|
||||||
php7.3-imap \
|
php-gmp \
|
||||||
php7.3-pspell \
|
php-snmp \
|
||||||
php7.3-recode \
|
php-ldap \
|
||||||
php7.3-sqlite3 \
|
php-mail \
|
||||||
php7.3-tidy \
|
php-mailparse \
|
||||||
php7.3-xmlrpc \
|
php-soap \
|
||||||
php7.3-xml \
|
php-mysql \
|
||||||
php7.3-mbstring \
|
php-memcached \
|
||||||
php7.3-gettext \
|
php-memcache \
|
||||||
php7.3-apcu \
|
php-igbinary \
|
||||||
php7.3-cli \
|
php-curl \
|
||||||
php7.3-common \
|
php-gd \
|
||||||
php7.3-cgi \
|
php-intl \
|
||||||
php7.3-json \
|
php-zip \
|
||||||
php7.3-readline \
|
php-bcmath \
|
||||||
php7.3-enchant \
|
php-imap \
|
||||||
php7.3-ssh2 \
|
php-pspell \
|
||||||
php7.3-oauth \
|
php-sqlite3 \
|
||||||
php7.3-gmagick \
|
php-tidy \
|
||||||
php7.3-gnupg \
|
php-xmlrpc \
|
||||||
php7.3-redis \
|
php-xml \
|
||||||
php7.3-smbclient \
|
php-mbstring \
|
||||||
php7.3-yaml \
|
php-gettext \
|
||||||
php7.3-geoip \
|
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 && \
|
sendmail && \
|
||||||
phpenmod \
|
phpenmod \
|
||||||
snmp \
|
snmp \
|
||||||
@ -106,7 +105,7 @@ RUN apt-get update && \
|
|||||||
xsl \
|
xsl \
|
||||||
yaml && \
|
yaml && \
|
||||||
a2enmod \
|
a2enmod \
|
||||||
php7.3 \
|
php7.4 \
|
||||||
rewrite \
|
rewrite \
|
||||||
ldap \
|
ldap \
|
||||||
heartmonitor \
|
heartmonitor \
|
||||||
@ -130,13 +129,13 @@ RUN apt-get update && \
|
|||||||
##################################################################
|
##################################################################
|
||||||
# Installing IOnCube addon
|
# 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 && \
|
RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \
|
||||||
cp /tmp/ioncube/ioncube_loader_lin_7.3.so /usr/lib/php/20170718/ && \
|
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.3.so" >> /etc/php/7.3/apache2/php.ini && \
|
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.3.so" >> /etc/php/7.3/cgi/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.3.so" >> /etc/php/7.3/cli/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.3.so" >> /etc/php/7.3/fpm/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
|
php -v
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
@ -156,6 +155,7 @@ RUN apt clean -y && \
|
|||||||
rm -rfv /var/cache/apt/archives/*.deb && \
|
rm -rfv /var/cache/apt/archives/*.deb && \
|
||||||
rm -rfv /tmp/deb/* && \
|
rm -rfv /tmp/deb/* && \
|
||||||
rm -rfv /tmp/composer-setup.php && \
|
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
|
rm -rfv /tmp/ioncube.tar.gz
|
||||||
|
|
||||||
#volumes
|
#volumes
|
||||||
|
Loading…
Reference in New Issue
Block a user