Skip to content

Commit

Permalink
Allow running commands at php-fpm entrypoint
Browse files Browse the repository at this point in the history
  • Loading branch information
Hardik Gajjar authored and dcole-inviqa committed Jul 16, 2019
1 parent 73ec350 commit c8f0bf7
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/_base/_twig/docker-compose.yml/application.yml.twig
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
php-fpm:
{% if @('app.build') == 'dynamic' %}
build: .my127ws/docker/image/php-fpm
entrypoint: /entrypoint.dynamic.sh
volumes:
- {{ (dockersync) ? @('workspace.name') ~ '-sync:/app:nocopy' : './:/app:delegated' }}
- ./.my127ws:/.my127ws
Expand Down
7 changes: 7 additions & 0 deletions src/_base/docker/image/php-fpm/Dockerfile.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,10 @@ RUN bash /fix_app_permissions.sh
VOLUME /app
{% endif %}
ENV APP_MODE {{ @('app.mode') }}

{% if @('app.build') == 'static' %}
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
{% else %}
ENTRYPOINT ["/entrypoint.dynamic.sh"]
{% endif %}
4 changes: 0 additions & 4 deletions src/_base/docker/image/php-fpm/root/entrypoint.sh

This file was deleted.

16 changes: 16 additions & 0 deletions src/_base/docker/image/php-fpm/root/entrypoint.sh.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

{% if @('php-fpm.entrypoint.steps') is not empty %}
docker_entrypoint()
{
# run any command required to be executed at docker startup
{% for step in @('php-fpm.entrypoint.steps') -%}
{{ step|raw }}
{% endfor %}
}

docker_entrypoint
{% endif %}

# run
exec supervisord -c /etc/supervisor/supervisord.conf -n
4 changes: 4 additions & 0 deletions src/_base/harness/attributes/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ attributes.default:
helm:
timeout: 300

php-fpm:
entrypoint:
steps: []

resources:
requests:
memory:
Expand Down
1 change: 1 addition & 0 deletions src/_base/harness/config/confd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ confd('harness:/'):
- { src: docker/image/nginx/root/etc/ssl/certs/app.crt }
- { src: docker/image/nginx/root/etc/ssl/private/app.key }
- { src: docker/image/php-fpm/Dockerfile }
- { src: docker/image/php-fpm/root/entrypoint.sh }
- { src: docker/image/php-fpm/root/fix_app_permissions.sh }
- { src: docker/image/php-fpm/root/usr/local/etc/php/php.ini }
- { src: docker/image/php-fpm/root/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini }
Expand Down
1 change: 1 addition & 0 deletions src/drupal8/harness/config/confd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ confd('harness:/'):
- { src: docker/image/nginx/root/etc/ssl/certs/app.crt }
- { src: docker/image/nginx/root/etc/ssl/private/app.key }
- { src: docker/image/php-fpm/Dockerfile }
- { src: docker/image/php-fpm/root/entrypoint.sh }
- { src: docker/image/php-fpm/root/fix_app_permissions.sh }
- { src: docker/image/php-fpm/root/usr/local/etc/php/php.ini }
- { src: docker/image/php-fpm/root/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini }
Expand Down
1 change: 1 addition & 0 deletions src/magento1/harness/config/confd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ confd('harness:/'):
- { src: docker/image/nginx/root/etc/ssl/certs/app.crt }
- { src: docker/image/nginx/root/etc/ssl/private/app.key }
- { src: docker/image/php-fpm/Dockerfile }
- { src: docker/image/php-fpm/root/entrypoint.sh }
- { src: docker/image/php-fpm/root/fix_app_permissions.sh }
- { src: docker/image/php-fpm/root/usr/local/etc/php/php.ini }
- { src: docker/image/php-fpm/root/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini }
Expand Down
1 change: 1 addition & 0 deletions src/magento2/harness/config/confd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ confd('harness:/'):
- { src: docker/image/nginx/root/etc/ssl/certs/app.crt }
- { src: docker/image/nginx/root/etc/ssl/private/app.key }
- { src: docker/image/php-fpm/Dockerfile }
- { src: docker/image/php-fpm/root/entrypoint.sh }
- { src: docker/image/php-fpm/root/fix_app_permissions.sh }
- { src: docker/image/php-fpm/root/usr/local/etc/php/php.ini }
- { src: docker/image/php-fpm/root/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini }
Expand Down
5 changes: 5 additions & 0 deletions src/spryker/harness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ attributes:
helm:
timeout: 900

php-fpm:
entrypoint:
steps:
- echo "$(getent hosts nginx | awk '{ print $1 }') $ZED_HOST" >> /etc/hosts

resources:
requests:
memory:
Expand Down
1 change: 1 addition & 0 deletions src/spryker/harness/config/confd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ confd('harness:/'):
- { src: docker/image/nginx/root/etc/ssl/certs/app.crt }
- { src: docker/image/nginx/root/etc/ssl/private/app.key }
- { src: docker/image/php-fpm/Dockerfile }
- { src: docker/image/php-fpm/root/entrypoint.sh }
- { src: docker/image/php-fpm/root/fix_app_permissions.sh }
- { src: docker/image/php-fpm/root/usr/local/etc/php/php.ini }
- { src: docker/image/php-fpm/root/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini }
Expand Down
1 change: 1 addition & 0 deletions src/wordpress/harness/config/confd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ confd('harness:/'):
- { src: docker/image/nginx/root/etc/ssl/certs/app.crt }
- { src: docker/image/nginx/root/etc/ssl/private/app.key }
- { src: docker/image/php-fpm/Dockerfile }
- { src: docker/image/php-fpm/root/entrypoint.sh }
- { src: docker/image/php-fpm/root/fix_app_permissions.sh }
- { src: docker/image/php-fpm/root/usr/local/etc/php/php.ini }
- { src: docker/image/php-fpm/root/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini }
Expand Down

0 comments on commit c8f0bf7

Please sign in to comment.