Skip to content
Snippets Groups Projects
Commit 2ef290dc authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !13
parents 4ce0e47d d3aec0f7
Branches
Tags v2.2.24
1 merge request!13Merging develop into main
Pipeline #515976 failed
......@@ -8,10 +8,6 @@ php:
stage: build
parallel:
matrix:
#- ALPINE: 3.5
# PHP: 7.0
#- ALPINE: 3.7
# PHP: 7.1
- ALPINE: '3.8'
PHP: '7.2'
- ALPINE: '3.11'
......@@ -23,7 +19,7 @@ php:
- ALPINE: '3.15'
PHP: '8.1'
script:
- docker build --pull --build-arg ALPINE_VERSION=${ALPINE} --build-arg PHP_MAJOR_VERSION=${PHP} --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-${PHP} .
- docker push $CI_REGISTRY_IMAGE:php-${PHP}
- docker build --pull --build-arg ALPINE_VERSION=${ALPINE} --build-arg PHP_MAJOR_VERSION=${PHP} --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
- docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:$[VERSION}
only:
- main
- tags
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment