Commit e31d600b authored by Deon George's avatar Deon George
Browse files

Added cleaning tmp AND moved ci build trigger to plus branch

Cache our builds based on branches - part 1
parent a072f6ed
Pipeline #170 failed with stage
in 3 minutes and 33 seconds
......@@ -5,7 +5,8 @@ stages:
- build
variables:
VERSION: 7.1-fpm-plus
BRANCH: plus
VERSION: 7.1-fpm-${BRANCH}
CACHETAG: build
DOCKER_REGISTRY: registry.leenooks.net
DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
......@@ -34,8 +35,8 @@ build:
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
- docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
- docker push ${CI_REGISTRY_IMAGE}:${VERSION}
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}-${BRANCH}
tags:
- docker
only:
- master
- plus
......@@ -8,7 +8,7 @@ RUN echo "deb http://deb.debian.org/debian jessie non-free" >> /etc/apt/sources.
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-install -j$(nproc) pdo_mysql bz2 gettext sockets gmp gd pcntl snmp exif \
&& pecl install imagick && docker-php-ext-enable imagick \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* /tmp/*
RUN apt-get update && apt-get install -y openssh-server && rm -rf /var/lib/apt/lists/* \
&& useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp
......
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