Commit bacbf539 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch '13-add-registry-name-in-all-docker-images' into 'master' 

Resolve "Add registry name in all Docker images"

Closes #13

See merge request to-be-continuous/php!33
parents a05695e2 544121b0

README.md

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ The PHP template uses some global configuration used throughout all jobs. 


| Name                  | description                            | default value     |

| --------------------- | -------------------------------------- | ----------------- |

| `PHP_IMAGE`           | The Docker image used to run PHP <br/>:warning: **set the version required by your project** | `php:latest` |

| `PHP_IMAGE`           | The Docker image used to run PHP <br/>:warning: **set the version required by your project** | `registry.hub.docker.com/library/php:latest` |

| `PHP_PROJECT_DIR`     | The PHP project root directory         | `.`               |



## Managing PHP extensions

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    {

      "name": "PHP_IMAGE",

      "description": "The Docker image used to run PHP - **set the version required by your project**",

      "default": "php:latest"

      "default": "registry.hub.docker.com/library/php:latest"

    },

    {

      "name": "PHP_PROJECT_DIR",

templates/gitlab-ci-php.yml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ variables: 
  TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"



  # PHP image (can be overridden)

  PHP_IMAGE: "php:latest"

  PHP_IMAGE: "registry.hub.docker.com/library/php:latest"



  PHP_PROJECT_DIR: "."