From fa9c63e28938bd90574f1d19a5220659bfcd2ffe Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 4 May 2016 22:20:43 +0200 Subject: [PATCH 1/2] Switch to new dev images --- Dockerfile.development | 50 +++++++++---------- .../tasks/bootstrap.yml | 4 -- .../tasks/bootstrap/php.xdebug.yml | 25 ---------- 3 files changed, 25 insertions(+), 54 deletions(-) delete mode 100644 provision/roles/boilerplate-main-development/tasks/bootstrap/php.xdebug.yml diff --git a/Dockerfile.development b/Dockerfile.development index 380caea..cf1165b 100644 --- a/Dockerfile.development +++ b/Dockerfile.development @@ -14,32 +14,32 @@ # debian-9 -> PHP 5.6 and 7.0 (stretch) # # Apache: -# webdevops/php-apache:ubuntu-12.04 -# webdevops/php-apache:ubuntu-14.04 -# webdevops/php-apache:ubuntu-15.04 -# webdevops/php-apache:ubuntu-15.10 -# webdevops/php-apache:ubuntu-16.04 -# webdevops/php-apache:ubuntu-16.04-php7 -# webdevops/php-apache:centos-7 -# webdevops/php-apache:debian-7 -# webdevops/php-apache:debian-8 -# webdevops/php-apache:debian-8-php7 -# webdevops/php-apache:debian-9 -# webdevops/php-apache:debian-9-php7 +# webdevops/php-apache-dev:ubuntu-12.04 +# webdevops/php-apache-dev:ubuntu-14.04 +# webdevops/php-apache-dev:ubuntu-15.04 +# webdevops/php-apache-dev:ubuntu-15.10 +# webdevops/php-apache-dev:ubuntu-16.04 +# webdevops/php-apache-dev:ubuntu-16.04-php7 +# webdevops/php-apache-dev:centos-7 +# webdevops/php-apache-dev:debian-7 +# webdevops/php-apache-dev:debian-8 +# webdevops/php-apache-dev:debian-8-php7 +# webdevops/php-apache-dev:debian-9 +# webdevops/php-apache-dev:debian-9-php7 # # Nginx: -# webdevops/php-nginx:ubuntu-12.04 -# webdevops/php-nginx:ubuntu-14.04 -# webdevops/php-nginx:ubuntu-15.04 -# webdevops/php-nginx:ubuntu-15.10 -# webdevops/php-nginx:ubuntu-16.04 -# webdevops/php-nginx:ubuntu-16.04-php7 -# webdevops/php-nginx:centos-7 -# webdevops/php-nginx:debian-7 -# webdevops/php-nginx:debian-8 -# webdevops/php-nginx:debian-8-php7 -# webdevops/php-nginx:debian-9 -# webdevops/php-nginx:debian-9-php7 +# webdevops/php-nginx-dev-dev:ubuntu-12.04 +# webdevops/php-nginx-dev-dev:ubuntu-14.04 +# webdevops/php-nginx-dev-dev:ubuntu-15.04 +# webdevops/php-nginx-dev-dev:ubuntu-15.10 +# webdevops/php-nginx-dev-dev:ubuntu-16.04 +# webdevops/php-nginx-dev-dev:ubuntu-16.04-php7 +# webdevops/php-nginx-dev-dev:centos-7 +# webdevops/php-nginx-dev-dev:debian-7 +# webdevops/php-nginx-dev-dev:debian-8 +# webdevops/php-nginx-dev-dev:debian-8-php7 +# webdevops/php-nginx-dev-dev:debian-9 +# webdevops/php-nginx-dev-dev:debian-9-php7 # # HHVM: # webdevops/hhvm-apache @@ -47,7 +47,7 @@ # #++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-14.04 +FROM webdevops/php-apache-dev:ubuntu-14.04 ENV PROVISION_CONTEXT "development" diff --git a/provision/roles/boilerplate-main-development/tasks/bootstrap.yml b/provision/roles/boilerplate-main-development/tasks/bootstrap.yml index f39fcf3..eb4bee1 100644 --- a/provision/roles/boilerplate-main-development/tasks/bootstrap.yml +++ b/provision/roles/boilerplate-main-development/tasks/bootstrap.yml @@ -5,7 +5,3 @@ - include: bootstrap/php-blackfire/redhat.yml when: ansible_os_family == 'Debian' and PROVISION.install.phpBlackfire is defined and PROVISION.install.phpBlackfire - -- include: bootstrap/php.xdebug.yml - when: PROVISION.install.phpXdebug is defined and PROVISION.install.phpXdebug - diff --git a/provision/roles/boilerplate-main-development/tasks/bootstrap/php.xdebug.yml b/provision/roles/boilerplate-main-development/tasks/bootstrap/php.xdebug.yml deleted file mode 100644 index c4471b4..0000000 --- a/provision/roles/boilerplate-main-development/tasks/bootstrap/php.xdebug.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- - -- name: Set php xdebug file [RedHat family] - set_fact: - php_xdebug_conf: /etc/php.d/xdebug.ini - when: ansible_os_family == 'RedHat' - -- name: Set php xdebug file [Debian family] - set_fact: - php_xdebug_conf: /etc/php5/mods-available/xdebug.ini - when: ansible_os_family == 'Debian' - -- name: Set php xdebug file [Ubuntu 12.04] - set_fact: - php_xdebug_conf: /etc/php5/conf.d/xdebug.ini - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == "12.04" - -- name: Enable xdebug - replace: - dest: '{{ php_xdebug_conf }}' - regexp: '^[\s]*;[\s]*({{ item }}[\s]*=.*)$' - replace: '\1' - with_items: - - 'zend_extension' - - 'extension' From f4f69e9932c0cbdea0b4c2e4f4d563bff7455729 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 11 May 2016 20:39:04 +0200 Subject: [PATCH 2/2] Implement new provison system --- Dockerfile.cloud | 3 +-- Dockerfile.development | 4 +--- Dockerfile.production | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile.cloud b/Dockerfile.cloud index 6e4733b..78291b9 100644 --- a/Dockerfile.cloud +++ b/Dockerfile.cloud @@ -57,8 +57,7 @@ COPY provision/ /opt/docker/provision/ COPY app/ /app/ -RUN /opt/docker/bin/control.sh provision.role.startup boilerplate-main \ - && /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \ +RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-deployment \ && /opt/docker/bin/bootstrap.sh # Configure volume/workdir diff --git a/Dockerfile.development b/Dockerfile.development index cf1165b..fe6454f 100644 --- a/Dockerfile.development +++ b/Dockerfile.development @@ -55,9 +55,7 @@ ENV PROVISION_CONTEXT "development" COPY etc/ /opt/docker/etc/ COPY provision/ /opt/docker/provision/ -RUN /opt/docker/bin/control.sh provision.role boilerplate-main \ - && /opt/docker/bin/control.sh provision.role boilerplate-main-development \ - && /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \ +RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-main-development boilerplate-deployment \ && /opt/docker/bin/bootstrap.sh # Configure volume/workdir diff --git a/Dockerfile.production b/Dockerfile.production index 9af6fb3..00af3a3 100644 --- a/Dockerfile.production +++ b/Dockerfile.production @@ -55,8 +55,7 @@ ENV PROVISION_CONTEXT "production" COPY etc/ /opt/docker/etc/ COPY provision/ /opt/docker/provision/ -RUN /opt/docker/bin/control.sh provision.role boilerplate-main \ - && /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \ +RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-deployment \ && /opt/docker/bin/bootstrap.sh # Configure volume/workdir