Commit 8258eef

committed

Merge branch 'master' into release/8.x

2 parents e441333 + 837d54f commit 8258eefCopy full SHA for 8258eef

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`PHP_IMAGE_NAME=local/dmstr/php-yii2`
`2`	`2`	`GITHUB_API_TOKEN=0000000000000000000000000000000000000000`
`3`	`3`
`4`		`-PHP_BASE_IMAGE_VERSION=7.4`
	`4`	`+PHP_BASE_IMAGE_VERSION=8.0`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,9 @@ variables:`
`10`	`10`	`before_script:`
`11`	`11`	`- export ISOLATION=buildpipeline${CI_PIPELINE_ID}`
`12`	`12`	`- export COMPOSE_PROJECT_NAME=${ISOLATION}${CI_BUILD_NAME}`
`13`		`- - export PHP_BASE_IMAGE_VERSION=7.4`
`14`		`- - export STACK_PHP_IMAGE=${PHP_IMAGE_NAME}:${PHP_BASE_IMAGE_VERSION}`
	`13`	`+ - export PHP_BASE_IMAGE_VERSION=8.0`
	`14`	`+ - export PHP_IMAGE_VERSION=$(git describe --always --dirty --tags)`
	`15`	`+ - export STACK_PHP_IMAGE=${PHP_IMAGE_NAME}:${PHP_IMAGE_VERSION}`
`15`	`16`	`- export REGISTRY_PHP_IMAGE=${PHP_IMAGE_NAME}:${CI_BUILD_REF_NAME}`
`16`	`17`	`- export REGISTRY_PHP_IMAGE_LATEST=${PHP_IMAGE_NAME}:latest`
`17`	`18`	`- echo "Build-environment information"`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@ Changelog`
`18`	`18`
`19`	`19`	`### 8.x`
`20`	`20`
`21`		`-- using updated yii2 images, different system package installation`
	`21`	`+- using updated yii2 images`
	`22`	`+ - different system package installation`
	`23`	`+ - composer 2`
`22`	`24`	- removed standalone `fpm` image
`23`	`25`
`24`	`26`	`### 7.x`

Comments

(0)