Skip to content

Commit 4bb9c94

Browse files
committed
Switch to new dev images
1 parent bd2827b commit 4bb9c94

File tree

5 files changed

+25
-58
lines changed

5 files changed

+25
-58
lines changed

Dockerfile.development

+25-25
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,40 @@
1414
# debian-9 -> PHP 5.6 and 7.0 (stretch)
1515
#
1616
# Apache:
17-
# webdevops/php-apache:ubuntu-12.04
18-
# webdevops/php-apache:ubuntu-14.04
19-
# webdevops/php-apache:ubuntu-15.04
20-
# webdevops/php-apache:ubuntu-15.10
21-
# webdevops/php-apache:ubuntu-16.04
22-
# webdevops/php-apache:ubuntu-16.04-php7
23-
# webdevops/php-apache:centos-7
24-
# webdevops/php-apache:debian-7
25-
# webdevops/php-apache:debian-8
26-
# webdevops/php-apache:debian-8-php7
27-
# webdevops/php-apache:debian-9
28-
# webdevops/php-apache:debian-9-php7
17+
# webdevops/php-apache-dev:ubuntu-12.04
18+
# webdevops/php-apache-dev:ubuntu-14.04
19+
# webdevops/php-apache-dev:ubuntu-15.04
20+
# webdevops/php-apache-dev:ubuntu-15.10
21+
# webdevops/php-apache-dev:ubuntu-16.04
22+
# webdevops/php-apache-dev:ubuntu-16.04-php7
23+
# webdevops/php-apache-dev:centos-7
24+
# webdevops/php-apache-dev:debian-7
25+
# webdevops/php-apache-dev:debian-8
26+
# webdevops/php-apache-dev:debian-8-php7
27+
# webdevops/php-apache-dev:debian-9
28+
# webdevops/php-apache-dev:debian-9-php7
2929
#
3030
# Nginx:
31-
# webdevops/php-nginx:ubuntu-12.04
32-
# webdevops/php-nginx:ubuntu-14.04
33-
# webdevops/php-nginx:ubuntu-15.04
34-
# webdevops/php-nginx:ubuntu-15.10
35-
# webdevops/php-nginx:ubuntu-16.04
36-
# webdevops/php-nginx:ubuntu-16.04-php7
37-
# webdevops/php-nginx:centos-7
38-
# webdevops/php-nginx:debian-7
39-
# webdevops/php-nginx:debian-8
40-
# webdevops/php-nginx:debian-8-php7
41-
# webdevops/php-nginx:debian-9
42-
# webdevops/php-nginx:debian-9-php7
31+
# webdevops/php-nginx-dev-dev:ubuntu-12.04
32+
# webdevops/php-nginx-dev-dev:ubuntu-14.04
33+
# webdevops/php-nginx-dev-dev:ubuntu-15.04
34+
# webdevops/php-nginx-dev-dev:ubuntu-15.10
35+
# webdevops/php-nginx-dev-dev:ubuntu-16.04
36+
# webdevops/php-nginx-dev-dev:ubuntu-16.04-php7
37+
# webdevops/php-nginx-dev-dev:centos-7
38+
# webdevops/php-nginx-dev-dev:debian-7
39+
# webdevops/php-nginx-dev-dev:debian-8
40+
# webdevops/php-nginx-dev-dev:debian-8-php7
41+
# webdevops/php-nginx-dev-dev:debian-9
42+
# webdevops/php-nginx-dev-dev:debian-9-php7
4343
#
4444
# HHVM:
4545
# webdevops/hhvm-apache
4646
# webdevops/hhvm-nginx
4747
#
4848
#++++++++++++++++++++++++++++++++++++++
4949

50-
FROM webdevops/php-apache:ubuntu-14.04
50+
FROM webdevops/php-apache-dev:ubuntu-14.04
5151

5252
ENV PROVISION_CONTEXT "development"
5353

etc/application.development.yml

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PROVISION:
44
systemUpdate: false
55

66
install:
7-
phpBlackfire: false
8-
phpXdebug: false
97
apacheModPagespeed: false
108

119
service:

etc/application.production.yml

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PROVISION:
44
systemUpdate: true
55

66
install:
7-
phpBlackfire: false
8-
phpXdebug: false
97
apacheModPagespeed: false
108

119
service:

provision/roles/boilerplate-main-development/tasks/bootstrap.yml

-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,3 @@
55

66
- include: bootstrap/php-blackfire/redhat.yml
77
when: ansible_os_family == 'Debian' and PROVISION.install.phpBlackfire is defined and PROVISION.install.phpBlackfire
8-
9-
- include: bootstrap/php.xdebug.yml
10-
when: PROVISION.install.phpXdebug is defined and PROVISION.install.phpXdebug
11-

provision/roles/boilerplate-main-development/tasks/bootstrap/php.xdebug.yml

-25
This file was deleted.

0 commit comments

Comments
 (0)