Commit 74308176 authored by Evghenii Paliiuc's avatar Evghenii Paliiuc 🤔

Merge branch 'paliiuc-master-patch-33402' into 'master'

Update xenial/Dockerfile, .gitlab-ci.yml files

See merge request !1
parents 35d7495e d406e879
Pipeline #1858 failed with stage
in 3 minutes and 52 seconds
......@@ -16,7 +16,7 @@ build:
stage: build
script:
- cd xenial
- docker build --pull -t "$CI_REGISTRY_IMAGE:7.1" .
- docker push "$CI_REGISTRY_IMAGE:7.1"
- docker build --pull --build-arg PHP_BASE_VERSION=7.3 -t "$CI_REGISTRY_IMAGE:7.3" .
- docker push "$CI_REGISTRY_IMAGE:7.3"
only:
- master
......@@ -5,17 +5,18 @@ FROM ubuntu:16.04
ENV PROJECT=default
ENV APP=/var/www/${PROJECT}
ENV env=Development
ARG PHP_BASE_VERSION=7.3
RUN export LANG=C.UTF-8 && \
apt-get update -y && \
apt-get install -y software-properties-common python-software-properties && \
add-apt-repository -y -u ppa:ondrej/php && \
apt-get install -y cron supervisor git apache2 php7.1 php7.1-gd php7.1-xdebug \
php7.1-cli php7.1-curl php-geoip php-imagick php7.1-imap php7.1-ldap \
php7.1-mcrypt php7.1-pgsql php7.1-xmlrpc libapache2-mod-php7.1 php7.1-xml \
php7.1-mbstring php7.1-cgi php7.1-fpm php7.1-soap php7.1-zip \
php7.1-bcmath php-pear postgresql-client wget unzip bzip2 libfontconfig1 libfontconfig1-dev libfreetype6 libfreetype6-dev && \
apt-get install -y cron supervisor git apache2 php${PHP_BASE_VERSION} php${PHP_BASE_VERSION}-gd php${PHP_BASE_VERSION}-xdebug \
php${PHP_BASE_VERSION}-cli php${PHP_BASE_VERSION}-curl php-geoip php-imagick php${PHP_BASE_VERSION}-imap php${PHP_BASE_VERSION}-ldap \
php${PHP_BASE_VERSION}-mcrypt php${PHP_BASE_VERSION}-pgsql php${PHP_BASE_VERSION}-xmlrpc libapache2-mod-php${PHP_BASE_VERSION} php${PHP_BASE_VERSION}-xml \
php${PHP_BASE_VERSION}-mbstring php${PHP_BASE_VERSION}-cgi php${PHP_BASE_VERSION}-fpm php${PHP_BASE_VERSION}-soap php${PHP_BASE_VERSION}-zip \
php${PHP_BASE_VERSION}-bcmath php-pear postgresql-client wget unzip bzip2 libfontconfig1 libfontconfig1-dev libfreetype6 libfreetype6-dev && \
postgresql-common && \
wget https://getcomposer.org/composer.phar && \
chmod +x composer.phar && \
mv composer.phar /usr/local/bin/composer && \
......@@ -23,9 +24,9 @@ RUN export LANG=C.UTF-8 && \
tar -xzvf ioncube_loaders_lin_x86-64.tar.gz && \
rm -rf ioncube_loaders_lin_x86-64.tar.gz && \
export extension_dir=$("php" -r "echo ini_get('extension_dir');") && \
cp ioncube/ioncube_loader_lin_7.1.so $extension_dir && \
cp ioncube/ioncube_loader_lin_${PHP_BASE_VERSION}.so $extension_dir && \
rm -rf ioncube && \
echo 'zend_extension = "'$extension_dir'/ioncube_loader_lin_7.1.so"' > /etc/php/7.1/apache2/conf.d/00-ioncube.ini && \
echo 'zend_extension = "'$extension_dir'/ioncube_loader_lin_${PHP_BASE_VERSION}.so"' > /etc/php/${PHP_BASE_VERSION}/apache2/conf.d/00-ioncube.ini && \
apt-get remove --purge -y software-properties-common && \
apt-get autoremove -y && \
apt-get clean && \
......@@ -39,7 +40,7 @@ RUN export LANG=C.UTF-8 && \
ADD docker/ /
RUN composer global require hirak/prestissimo && \
a2enmod php7.1 && a2enconf php7.1-fpm && a2enconf php7.1-cgi && a2enmod rewrite && \
a2enmod php${PHP_BASE_VERSION} && a2enconf php${PHP_BASE_VERSION}-fpm && a2enconf php${PHP_BASE_VERSION}-cgi && a2enmod rewrite && \
phpenmod mcrypt && \
mkdir ~/.ssh/ && \
chmod +x /*.sh && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment