Updated to 7.3 and added wkhtml and mysql client
This commit is contained in:
parent
3279c0e869
commit
39d7aaab42
@ -6,7 +6,7 @@ stages:
|
||||
|
||||
variables:
|
||||
BRANCH: ext
|
||||
VERSION: 7.2-fpm-${BRANCH}
|
||||
VERSION: 7.3-fpm-${BRANCH}
|
||||
CACHETAG: build-${BRANCH}
|
||||
DOCKER_HOST: tcp://docker:2375
|
||||
|
||||
@ -32,7 +32,7 @@ x86_64:build:
|
||||
stage: build
|
||||
script:
|
||||
- if [ -f init ]; then chmod 500 init; fi
|
||||
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
|
||||
- ([ -z "$REFRESH" ] && 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}
|
||||
|
@ -1,10 +1,11 @@
|
||||
# NAME leenooks/php
|
||||
# VERSION 7.2-fpm-ext
|
||||
# VERSION 7.3-fpm-ext
|
||||
|
||||
FROM registry.leenooks.net/leenooks/php:7.2-fpm-plus
|
||||
FROM registry.leenooks.net/leenooks/php:7.3-fpm-plus
|
||||
|
||||
RUN echo "deb http://deb.debian.org/debian stretch non-free" >> /etc/apt/sources.list.d/non-free.list && apt-get update \
|
||||
&& apt-get install -y inetutils-ping fping pkg-config libsnmp-dev snmp-mibs-downloader --no-install-recommends \
|
||||
RUN echo "deb http://deb.debian.org/debian buster non-free" >> /etc/apt/sources.list.d/non-free.list && apt-get update \
|
||||
&& apt-get install -y wkhtmltopdf mariadb-client-10.3 inetutils-ping fping 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/*
|
||||
|
Loading…
Reference in New Issue
Block a user