Skip to content

docker-php-yii2
docker-php-yii2
Commit 8258eef2 authored by Tobias Munk's avatar Tobias Munk
Browse files
Options

Merge branch 'master' into release/8.x

parents e4413331 837d54f2
Pipeline #65220 failed with stages
        in 38 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 7 additions and 4 deletions
        .env-dist
        View file @ 8258eef2
        PHP_IMAGE_NAME=local/dmstr/php-yii2 PHP_IMAGE_NAME=local/dmstr/php-yii2
        GITHUB_API_TOKEN=0000000000000000000000000000000000000000 GITHUB_API_TOKEN=0000000000000000000000000000000000000000
        PHP_BASE_IMAGE_VERSION=7.4 PHP_BASE_IMAGE_VERSION=8.0
        .gitlab-ci.yml
        View file @ 8258eef2
        ...@@ -10,8 +10,9 @@ variables: ...@@ -10,8 +10,9 @@ variables:
        before_script: before_script:
        - export ISOLATION=buildpipeline${CI_PIPELINE_ID} - export ISOLATION=buildpipeline${CI_PIPELINE_ID}
        - export COMPOSE_PROJECT_NAME=${ISOLATION}${CI_BUILD_NAME} - export COMPOSE_PROJECT_NAME=${ISOLATION}${CI_BUILD_NAME}
        - export PHP_BASE_IMAGE_VERSION=7.4 - export PHP_BASE_IMAGE_VERSION=8.0
        - export STACK_PHP_IMAGE=${PHP_IMAGE_NAME}:${PHP_BASE_IMAGE_VERSION} - export PHP_IMAGE_VERSION=$(git describe --always --dirty --tags)
        - export STACK_PHP_IMAGE=${PHP_IMAGE_NAME}:${PHP_IMAGE_VERSION}
        - export REGISTRY_PHP_IMAGE=${PHP_IMAGE_NAME}:${CI_BUILD_REF_NAME} - export REGISTRY_PHP_IMAGE=${PHP_IMAGE_NAME}:${CI_BUILD_REF_NAME}
        - export REGISTRY_PHP_IMAGE_LATEST=${PHP_IMAGE_NAME}:latest - export REGISTRY_PHP_IMAGE_LATEST=${PHP_IMAGE_NAME}:latest
        - echo "Build-environment information" - echo "Build-environment information"
        ......
        README.md
        View file @ 8258eef2
        ...@@ -18,7 +18,9 @@ Changelog ...@@ -18,7 +18,9 @@ Changelog
        ### 8.x ### 8.x
        - using updated yii2 images, different system package installation - using updated yii2 images
        - different system package installation
        - composer 2
        - removed standalone `fpm` image - removed standalone `fpm` image
        ### 7.x ### 7.x
        ......
        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