Update to PHP 8.0
This commit is contained in:
parent
e037baadeb
commit
f2602bd98a
@ -7,7 +7,7 @@ stages:
|
||||
|
||||
variables:
|
||||
BRANCH: mp
|
||||
VERSION: 7.4-fpm-${BRANCH}
|
||||
VERSION: 8.0-fpm-${BRANCH}
|
||||
CACHETAG: build-${BRANCH}
|
||||
DOCKER_HOST: tcp://docker:2375
|
||||
|
||||
@ -33,7 +33,7 @@ x86_64:build:
|
||||
stage: build
|
||||
script:
|
||||
- if [ -f init ]; then chmod 500 init; fi
|
||||
- ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "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}
|
||||
@ -47,7 +47,7 @@ x86_64:build-test:
|
||||
stage: build-test
|
||||
script:
|
||||
- if [ -f init ]; then chmod 500 init; fi
|
||||
- ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true"
|
||||
- ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || true
|
||||
- docker build --file Dockerfile.phptest --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION}-test .
|
||||
- docker push ${CI_REGISTRY_IMAGE}:${VERSION}-test
|
||||
tags:
|
||||
|
@ -1,7 +1,7 @@
|
||||
# NAME leenooks/php
|
||||
# VERSION 7.4-fpm-mp
|
||||
# VERSION 8.0-fpm-mp
|
||||
|
||||
FROM php:7.4-fpm
|
||||
FROM php:8.0-fpm
|
||||
|
||||
RUN apt-get update && apt-get install -y openssh-server unzip git msmtp nginx wait-for-it \
|
||||
&& rm /etc/nginx/sites-enabled/default \
|
||||
|
@ -1,7 +1,7 @@
|
||||
# NAME leenooks/php
|
||||
# VERSION 7.4-fpm-test
|
||||
# VERSION 8.0-fpm-test
|
||||
|
||||
FROM registry.leenooks.net/leenooks/php:7.4-fpm-mp
|
||||
FROM registry.leenooks.net/leenooks/php:8.0-fpm-mp
|
||||
|
||||
RUN pecl install xdebug \
|
||||
&& docker-php-ext-enable xdebug
|
||||
|
Loading…
Reference in New Issue
Block a user