diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc4bd21..da13e07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: - build variables: - BRANCH: plus + BRANCH: ext VERSION: 7.1-fpm-${BRANCH} CACHETAG: build-${BRANCH} DOCKER_REGISTRY: registry.leenooks.net @@ -39,4 +39,4 @@ build: tags: - docker only: - - plus + - ext diff --git a/Dockerfile b/Dockerfile index d6e718e..49f05fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ # NAME leenooks/php -# VERSION 7.1-fpm-plus +# VERSION 7.1-fpm-ext -FROM registry.leenooks.net/leenooks/php:7.1-fpm-mysql +FROM registry.leenooks.net/leenooks/php:7.1-fpm-plus -RUN apt-get update \ - && apt-get install -y libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev libmagickwand-dev --no-install-recommends \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-jpeg-dir=/usr/include/ \ - && docker-php-ext-install -j$(nproc) bz2 gettext sockets gmp gd pcntl exif \ - && pecl install imagick && docker-php-ext-enable imagick \ +RUN echo "deb http://deb.debian.org/debian jessie non-free" >> /etc/apt/sources.list.d/non-free.list && apt-get update \ + && apt-get install -y pkg-config libsnmp-dev snmp-mibs-downloader --no-install-recommends \ + && download-mibs \ + && docker-php-ext-install -j$(nproc) snmp \ && rm -rf /var/lib/apt/lists/* /tmp/*