Skip to content

Commit

Permalink
Switch to shell based provisioning
Browse files Browse the repository at this point in the history
* Remove ansible and python by default
* Switch to go-replace and shell scripts for provisioning
* Fix tests for new provisioning
  • Loading branch information
mblaschke committed May 13, 2017
1 parent 6aa18d2 commit 6390b47
Show file tree
Hide file tree
Showing 3,733 changed files with 22,197 additions and 49,673 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 0 additions & 6 deletions conf/provision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,11 @@ provision:
development/general: '*'
php-apache-dev:
configuration:
apache/general : '*'
apache/centos : centos-*
apache/alpine : alpine
php-apache/general: '*'
php-dev/general : '*'
apache-dev/general: '*'
php-nginx-dev:
configuration:
nginx/general : '*'
nginx/centos : centos-*
nginx/alpine : alpine
php-nginx/general : '*'
php-dev/general : '*'
nginx-dev/general : '*'
Expand Down
6 changes: 1 addition & 5 deletions docker/apache-dev/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/debian-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/debian-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/debian-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/ubuntu-12.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/ubuntu-14.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/ubuntu-15.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/ubuntu-15.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/ubuntu-16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions docker/apache-dev/ubuntu-16.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \

COPY conf/ /opt/docker/

# Install apache
RUN echo \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup


EXPOSE 80 443

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion docker/apache/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ RUN /usr/local/bin/apk-install \
s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
' /etc/apache2/httpd.conf \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \
&& /opt/docker/bin/bootstrap.sh \
&& docker-image-cleanup

Expand Down
Loading

0 comments on commit 6390b47

Please sign in to comment.