Skip to content

Commit

Permalink
Add cleanup for centos
Browse files Browse the repository at this point in the history
  • Loading branch information
mblaschke committed Mar 1, 2017
1 parent 308bd80 commit 9d48139
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
3 changes: 3 additions & 0 deletions docker/php/centos-7-php56/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \
&& pecl install imagick \
# && pecl install redis \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
# Cleanup
&& yum erase -y php-devel gcc \
&& yum clean all \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \
&& /opt/docker/bin/bootstrap.sh

Expand Down
3 changes: 3 additions & 0 deletions docker/php/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ RUN /usr/local/bin/yum-install \
&& pear config-set auto_discover 1 \
&& pecl install imagick \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
# Cleanup
&& yum erase -y php-devel gcc \
&& yum clean all \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \
&& /opt/docker/bin/bootstrap.sh

Expand Down
6 changes: 6 additions & 0 deletions template/Dockerfile/images/php5.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ RUN /usr/local/bin/yum-install \
&& pear config-set auto_discover 1 \
&& pecl install imagick \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
# Cleanup
&& yum erase -y php-devel gcc \
&& yum clean all \
{{ provision.runRoleInline('php', role) }}
{%- endmacro %}

Expand Down Expand Up @@ -140,6 +143,9 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \
&& pecl install imagick \
# && pecl install redis \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
# Cleanup
&& yum erase -y php-devel gcc \
&& yum clean all \
{{ provision.runRoleInline('php', role) }}
{%- endmacro %}

Expand Down

0 comments on commit 9d48139

Please sign in to comment.