Commit 44005f26 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

Merge branch 'task-php81-container' into 'master'

[TASK] Add php8.1 docker image

See merge request !1
parents 59b0e6b6 da75e1d7
......@@ -18,6 +18,11 @@ MAJOR_PHP80=2
MINOR_PHP80=0
PATCHLEVEL_PHP80=5
NAME_PHP81 = typo3/core-testing-php81
MAJOR_PHP81=1
MINOR_PHP81=0
PATCHLEVEL_PHP81=0
NAME_JS = typo3/core-testing-js
MAJOR_JS=1
MINOR_JS=0
......@@ -57,6 +62,8 @@ FULLVERSION_PHP74=$(MAJOR_PHP74).$(MINOR_PHP74).$(PATCHLEVEL_PHP74)
SHORTVERSION_PHP74=$(MAJOR_PHP74).$(MINOR_PHP74)
FULLVERSION_PHP80=$(MAJOR_PHP80).$(MINOR_PHP80).$(PATCHLEVEL_PHP80)
SHORTVERSION_PHP80=$(MAJOR_PHP80).$(MINOR_PHP80)
FULLVERSION_PHP81=$(MAJOR_PHP81).$(MINOR_PHP81).$(PATCHLEVEL_PHP81)
SHORTVERSION_PHP81=$(MAJOR_PHP81).$(MINOR_PHP81)
FULLVERSION_JS=$(MAJOR_JS).$(MINOR_JS).$(PATCHLEVEL_JS)
SHORTVERSION_JS=$(MAJOR_JS).$(MINOR_JS)
FULLVERSION_JSCHROME=$(MAJOR_JSCHROME).$(MINOR_JSCHROME).$(PATCHLEVEL_JSCHROME)
......@@ -78,6 +85,7 @@ SHORTVERSION_DOCKERDIND=$(MAJOR_DOCKERDIND).$(MINOR_DOCKERDIND)
build_core_testing_php73 \
build_core_testing_php74 \
build_core_testing_php80 \
build_core_testing_php81 \
build_core_testing_js \
build_core_testing_js_chrome \
build_core_testing_js_node8 \
......@@ -116,6 +124,7 @@ build: \
build_core_testing_php73 \
build_core_testing_php74 \
build_core_testing_php80 \
build_core_testing_php81 \
build_core_testing_js \
build_core_testing_js_chrome \
build_core_testing_js_node8 \
......@@ -128,6 +137,7 @@ release: \
release_core_testing_php73 \
release_core_testing_php74 \
release_core_testing_php80 \
release_core_testing_php81 \
release_core_testing_js \
release_core_testing_js_chrome \
release_core_testing_js_node8 \
......@@ -140,6 +150,7 @@ clean_images: \
clean_images_core_testing_php73 \
clean_images_core_testing_php74 \
clean_images_core_testing_php80 \
clean_images_core_testing_php81 \
clean_images_core_testing_js \
clean_images_core_testing_js_chrome \
clean_images_core_testing_js_node8 \
......@@ -223,6 +234,24 @@ clean_images_core_testing_php80:
docker rmi $(NAME_PHP80):$(SHORTVERSION_PHP80) || true
docker rmi $(NAME_PHP80):$(FULLVERSION_PHP80) || true
build_core_testing_php81:
docker build --force-rm --rm -t $(NAME_PHP81):$(FULLVERSION_PHP81) core-testing-php81
docker tag $(NAME_PHP81):$(FULLVERSION_PHP81) $(NAME_PHP81):$(SHORTVERSION_PHP81)
release_core_testing_php81:
@if ! docker images $(NAME_PHP81) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_PHP81); then \
echo "$(NAME_PHP81) version $(FULLVERSION_PHP81) is not yet built. Please run 'make build'"; false; \
fi
docker tag $(NAME_PHP81):$(FULLVERSION_PHP81) $(NAME_PHP81):latest
docker push $(NAME_PHP81):latest
docker push $(NAME_PHP81):$(FULLVERSION_PHP81)
docker push $(NAME_PHP81):$(SHORTVERSION_PHP81)
clean_images_core_testing_php81:
docker rmi $(NAME_PHP81):latest || true
docker rmi $(NAME_PHP81):$(SHORTVERSION_PHP81) || true
docker rmi $(NAME_PHP81):$(FULLVERSION_PHP81) || true
build_core_testing_js:
docker build -t $(NAME_JS):$(FULLVERSION_JS) core-testing-js
......
FROM php:8.1.0RC1-alpine
MAINTAINER Christian Kuhn <lolli@schwarzbu.ch>
# We use convenient install-php-extensions script to manage additional php extensions
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
RUN apk add --no-cache \
bash \
file \
git \
graphicsmagick \
grep \
&& chmod +x /usr/local/bin/install-php-extensions \
&& sync \
&& install-php-extensions \
apcu \
bcmath \
bz2 \
@composer-2 \
gd \
gettext \
gmp \
intl \
memcached \
mysqli \
opcache \
pdo_mysql \
pdo_pgsql \
pdo_sqlsrv \
pgsql \
pspell \
redis \
soap \
sqlsrv \
sysvsem \
xdebug \
zip \
&& mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
&& sed -i s/';phar.readonly = On'/'phar.readonly = Off'/ $PHP_INI_DIR/php.ini \
&& sed -i s/'memory_limit = 128M'/'memory_limit = 2G'/ $PHP_INI_DIR/php.ini \
&& sed -i s/'max_execution_time = 30'/'max_execution_time = 240'/ $PHP_INI_DIR/php.ini \
&& sed -i s/';max_input_vars = 1000'/'max_input_vars = 1500'/ $PHP_INI_DIR/php.ini \
&& echo "xdebug.max_nesting_level = 400" >> $PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini \
&& echo "apc.enable_cli=1" >> $PHP_INI_DIR/conf.d/docker-php-ext-apcu.ini \
&& echo "apc.slam_defense=0" >> $PHP_INI_DIR/conf.d/docker-php-ext-apcu.ini \
&& rm -rf /var/cache/apk/*
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