Skip to content

Commit 229ea92

Browse files
mblaschkemblaschke
committed
Replace provisioning system
Not needed anymore with newer images
1 parent a6418ed commit 229ea92

24 files changed

+12
-416
lines changed

Diff for: ‎Dockerfile.cloud

+4-3
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@ ENV PROVISION_CONTEXT "production"
5858

5959
# Deploy scripts/configurations
6060
COPY etc/ /opt/docker/etc/
61-
COPY provision/ /opt/docker/provision/
6261

6362
COPY app/ /app/
6463

65-
# RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-deployment \
66-
# && /opt/docker/bin/bootstrap.sh
64+
RUN ln -sf /opt/docker/etc/cron/crontab /etc/cron.d/docker-boilerplate \
65+
&& chmod 0644 /opt/docker/etc/cron/crontab \
66+
&& echo >> /opt/docker/etc/cron/crontab \
67+
&& ln -sf /opt/docker/etc/php/production.ini /opt/docker/etc/php/php.ini
6768

6869
# Configure volume/workdir
6970
WORKDIR /app/

Diff for: ‎Dockerfile.development

+4-3
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ ENV PROVISION_CONTEXT "development"
5555

5656
# Deploy scripts/configurations
5757
COPY etc/ /opt/docker/etc/
58-
COPY provision/ /opt/docker/provision/
5958

60-
# RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-main-development --role boilerplate-deployment \
61-
# && /opt/docker/bin/bootstrap.sh
59+
RUN ln -sf /opt/docker/etc/cron/crontab /etc/cron.d/docker-boilerplate \
60+
&& chmod 0644 /opt/docker/etc/cron/crontab \
61+
&& echo >> /opt/docker/etc/cron/crontab \
62+
&& ln -sf /opt/docker/etc/php/development.ini /opt/docker/etc/php/php.ini
6263

6364
# Configure volume/workdir
6465
WORKDIR /app/

Diff for: ‎Dockerfile.production

+4-3
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,11 @@ ENV PROVISION_CONTEXT "production"
5858

5959
# Deploy scripts/configurations
6060
COPY etc/ /opt/docker/etc/
61-
COPY provision/ /opt/docker/provision/
6261

63-
# RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-deployment \
64-
# && /opt/docker/bin/bootstrap.sh
62+
RUN ln -sf /opt/docker/etc/cron/crontab /etc/cron.d/docker-boilerplate \
63+
&& chmod 0644 /opt/docker/etc/cron/crontab \
64+
&& echo >> /opt/docker/etc/cron/crontab \
65+
&& ln -sf /opt/docker/etc/php/production.ini /opt/docker/etc/php/php.ini
6566

6667
# Configure volume/workdir
6768
WORKDIR /app/

Diff for: ‎etc/application.development.yml

-46
This file was deleted.

Diff for: ‎etc/application.production.yml

-46
This file was deleted.

Diff for: ‎provision/roles/boilerplate-deployment/tasks/main.yml

-3
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main-development/defaults/main.yml

-3
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main-development/tasks/bootstrap.yml

-1
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main-development/tasks/main.yml

-6
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/defaults/main.yml

-3
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/handlers/main.yml

-3
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/bootstrap.yml

-29
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/bootstrap/cron.yml

-18
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/bootstrap/dnsmasq.yml

-12
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/bootstrap/php.yml

-53
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/bootstrap/postfix.yml

-18
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/bootstrap/services.yml

-11
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/bootstrap/web.apache.pagespeed.yml

-18
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/bootstrap/web.apache.yml

-13
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/bootstrap/web.nginx.yml

-13
This file was deleted.

Diff for: ‎provision/roles/boilerplate-main/tasks/main.yml

-5
This file was deleted.

0 commit comments

Comments
 (0)