Commit a6c5ea54 authored by Tobias Munk's avatar Tobias Munk

switched to yii2 base PHP 7.4 image

parent 9313b344
Pipeline #47952 passed with stages
in 1 minute and 44 seconds
......@@ -2,4 +2,4 @@ PHP_IMAGE_NAME=local/dmstr/php-yii2
PHP_IMAGE_VERSION=latest
GITHUB_API_TOKEN=0000000000000000000000000000000000000000
PHP_BASE_IMAGE_VERSION=7.3
PHP_BASE_IMAGE_VERSION=7.4
......@@ -13,7 +13,7 @@ variables:
before_script:
- export ISOLATION=buildpipeline${CI_PIPELINE_ID}
- export COMPOSE_PROJECT_NAME=${ISOLATION}${CI_BUILD_NAME}
- export PHP_BASE_IMAGE_VERSION=7.3
- export PHP_BASE_IMAGE_VERSION=7.4
- export PHP_IMAGE_VERSION=$(git describe --always --dirty --tags)
- export STACK_PHP_IMAGE=${PHP_IMAGE_NAME}:${PHP_IMAGE_VERSION}
- export REGISTRY_PHP_IMAGE=${PHP_IMAGE_NAME}:${CI_BUILD_REF_NAME}
......@@ -108,4 +108,4 @@ release:nginx:tags:
- docker login --username ${REGISTRY_USER} --password ${REGISTRY_PASS} ${REGISTRY_HOST}
- docker tag ${STACK_PHP_IMAGE}-nginx ${REGISTRY_PHP_IMAGE}-nginx
- docker push ${REGISTRY_PHP_IMAGE}-nginx
- docker logout ${REGISTRY_HOST}
\ No newline at end of file
- docker logout ${REGISTRY_HOST}
......@@ -2,7 +2,7 @@
# ==============================================
ARG PHP_BASE_IMAGE_VERSION
FROM php:${PHP_BASE_IMAGE_VERSION}-fpm
FROM yiisoftware/yii2-php:${PHP_BASE_IMAGE_VERSION}-fpm
# Install system packages for PHP extensions recommended for Yii 2.0 Framework
ENV DEBIAN_FRONTEND=noninteractive
......@@ -13,25 +13,7 @@ RUN apt-get update && \
apt-key update && \
apt-get update && \
apt-get -y install \
g++ \
git \
bash-completion \
curl \
imagemagick \
libfreetype6-dev \
libcurl3-dev \
libicu-dev \
libfreetype6-dev \
libjpeg-dev \
libjpeg62-turbo-dev \
libmagickwand-dev \
libpq-dev \
libpng-dev \
libzip-dev \
zlib1g-dev \
default-mysql-client \
openssh-client \
libxml2-dev \
nano \
npm \
--no-install-recommends && \
......@@ -39,46 +21,6 @@ RUN apt-get update && \
npm -g install npm@latest && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Install PHP extensions required for Yii 2.0 Framework
RUN docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ && \
docker-php-ext-configure bcmath && \
docker-php-ext-install \
soap \
zip \
curl \
bcmath \
exif \
gd \
iconv \
intl \
mbstring \
opcache \
pdo_mysql \
pdo_pgsql
# Install PECL extensions
# see http://stackoverflow.com/a/8154466/291573) for usage of `printf`
RUN printf "\n" | pecl install \
apcu-5.1.14 \
imagick && \
docker-php-ext-enable \
apcu \
imagick
# Install xdebug
RUN cd /tmp && \
git clone git://github.com/xdebug/xdebug.git && \
cd xdebug && \
git checkout tags/2.8.0 && \
phpize && \
./configure --enable-xdebug && \
make && \
make install && \
rm -rf /tmp/xdebug
# Install less-compiler
RUN npm install -g \
less \
......@@ -90,14 +32,6 @@ RUN npm install -g \
RUN curl -L https://raw.githubusercontent.com/yiisoft/yii2/master/contrib/completion/bash/yii \
-o /etc/bash_completion.d/yii
ENV PHP_USER_ID=33 \
PHP_ENABLE_XDEBUG=0 \
VERSION_COMPOSER_ASSET_PLUGIN=^1.4.3 \
VERSION_PRESTISSIMO_PLUGIN=^0.3.0 \
PATH=/app:/app/vendor/bin:/root/.composer/vendor/bin:$PATH \
TERM=linux \
COMPOSER_ALLOW_SUPERUSER=1
# Add configuration files
COPY image-files/ /
......@@ -107,16 +41,6 @@ RUN chmod 700 \
/usr/local/bin/docker-run.sh \
/usr/local/bin/composer
# Install composer
RUN curl -sS https://getcomposer.org/installer | php -- \
--filename=composer.phar \
--install-dir=/usr/local/bin && \
composer global require --optimize-autoloader \
"fxp/composer-asset-plugin:${VERSION_COMPOSER_ASSET_PLUGIN}" \
"hirak/prestissimo:${VERSION_PRESTISSIMO_PLUGIN}" && \
composer global dumpautoload --optimize && \
composer clear-cache
WORKDIR /app
# Startup script for FPM
......
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