diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-09 10:47:39 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-09 10:47:39 +0000 |
commit | a87e2c99dc3215b8caeb670a810aa6c41b733776 (patch) | |
tree | 6a3d0f55bef29769dc95fb89314c302d15a971b3 | |
parent | 12422dbf10a1fca27b6f3c51224d3bb25ed173ed (diff) | |
parent | f00c1718e9b9046cd7b3f153eae37ffd26b78fb4 (diff) | |
download | gitlab-ce-a87e2c99dc3215b8caeb670a810aa6c41b733776.tar.gz |
Merge branch 'patch-29' into 'master'
Updates to php:latest
See merge request gitlab-org/gitlab-ce!30319
-rw-r--r-- | changelogs/unreleased/patch-29.yml | 5 | ||||
-rw-r--r-- | lib/gitlab/ci/templates/PHP.gitlab-ci.yml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/patch-29.yml b/changelogs/unreleased/patch-29.yml new file mode 100644 index 00000000000..674c06e1259 --- /dev/null +++ b/changelogs/unreleased/patch-29.yml @@ -0,0 +1,5 @@ +--- +title: Updates PHP template to php:latest to ensure always targeting latest stable +merge_request: 30319 +author: Paul Giberson +type: changed diff --git a/lib/gitlab/ci/templates/PHP.gitlab-ci.yml b/lib/gitlab/ci/templates/PHP.gitlab-ci.yml index b9fee2d5731..25ea20e454f 100644 --- a/lib/gitlab/ci/templates/PHP.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/PHP.gitlab-ci.yml @@ -1,5 +1,5 @@ # Select image from https://hub.docker.com/_/php/ -image: php:7.1.1 +image: php:latest # Select what we should cache between builds cache: |