Skip to content

Commit 2af7d79

Browse files
mblaschkemblaschke
committed
Merge branch 'release/5.0.0'
2 parents b286d71 + 8d90ecf commit 2af7d79

File tree

148 files changed

+1269
-2434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+1269
-2434
lines changed

‎.dockerignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
*.md
2+
.git*
3+
backup/*
4+
bin/*
5+
app/*
6+
docker/*
7+
documentation/*

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
.idea
33
nbproject
44
/backup/*
5-
/code/*
5+
/app/*
6+
/docker-compose.yml

‎CHANGELOG.md‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
1-
TYPO3 Docker Boilerplate Changelog
1+
PHP Docker Boilerplate Changelog
22
==================================
33

4-
4.1.0 - UPCOMING
4+
5.1.0 - UPCOMING
5+
----------------
6+
7+
5.0.0 - 2016-03-07
8+
------------------
9+
- Refactored with new `webdevops/base` images
10+
- Faster creation/startup times
11+
- Ansible provisioning
12+
- Real production and development provisioning
13+
- Added cloud support (without host mounted volumes)
14+
- Moved `code/` to `app/` (Moved `/application/code` to `/app` inside Docker container)
15+
- Renamed `main` to `app` container
16+
17+
4.1.0 - canceled
518
------------------
619
- Added cron
720
- Improved documentation
821
- Splitted MySQL Dockerfiles (with version and fork - MySQL, MariaDB and Percona)
922
- Fixed slow shutdown of storage (thanks to Stephan Ferraro)
23+
- Added MySQL host and port as environment variables
1024

1125
4.0.0 - 2015-08-13 - t3ugs @jweilandnet
1226
---------------------------------------

‎Dockerfile.cloud‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# PHP application Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
#
5+
# PHP-Versions:
6+
# ubuntu-12.04 -> PHP 5.3 (precise) LTS
7+
# ubuntu-14.04 -> PHP 5.5 (trusty) LTS
8+
# ubuntu-15.04 -> PHP 5.6 (vivid)
9+
# ubuntu-15.10 -> PHP 5.6 (wily)
10+
# ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial) LTS
11+
# centos-7 -> PHP 5.4
12+
# debian-7 -> PHP 5.4 (wheezy)
13+
# debian-8 -> PHP 5.6 and 7.x (jessie)
14+
# debian-9 -> PHP 5.6 and 7.0 (stretch)
15+
#
16+
# Apache:
17+
# webdevops/php-apache:ubuntu-12.04
18+
# webdevops/php-apache:ubuntu-14.04
19+
# webdevops/php-apache:ubuntu-15.04
20+
# webdevops/php-apache:ubuntu-15.10
21+
# webdevops/php-apache:ubuntu-16.04
22+
# webdevops/php-apache:ubuntu-16.04-php7
23+
# webdevops/php-apache:centos-7
24+
# webdevops/php-apache:debian-7
25+
# webdevops/php-apache:debian-8
26+
# webdevops/php-apache:debian-8-php7
27+
# webdevops/php-apache:debian-9
28+
# webdevops/php-apache:debian-9-php7
29+
#
30+
# Nginx:
31+
# webdevops/php-nginx:ubuntu-12.04
32+
# webdevops/php-nginx:ubuntu-14.04
33+
# webdevops/php-nginx:ubuntu-15.04
34+
# webdevops/php-nginx:ubuntu-15.10
35+
# webdevops/php-nginx:ubuntu-16.04
36+
# webdevops/php-nginx:ubuntu-16.04-php7
37+
# webdevops/php-nginx:centos-7
38+
# webdevops/php-nginx:debian-7
39+
# webdevops/php-nginx:debian-8
40+
# webdevops/php-nginx:debian-8-php7
41+
# webdevops/php-nginx:debian-9
42+
# webdevops/php-nginx:debian-9-php7
43+
#
44+
# HHVM:
45+
# webdevops/hhvm-apache
46+
# webdevops/hhvm-nginx
47+
#
48+
#++++++++++++++++++++++++++++++++++++++
49+
50+
FROM webdevops/php-apache:ubuntu-14.04
51+
52+
ENV PROVISION_CONTEXT "production"
53+
54+
# Deploy scripts/configurations
55+
COPY etc/ /opt/docker/etc/
56+
COPY provision/ /opt/docker/provision/
57+
58+
COPY app/ /app/
59+
60+
RUN /opt/docker/bin/control.sh provision.role.startup boilerplate-main \
61+
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
62+
&& /opt/docker/bin/bootstrap.sh
63+
64+
# Configure volume/workdir
65+
RUN mkdir -p /app/
66+
WORKDIR /app/

‎Dockerfile.development‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# PHP application Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
#
5+
# PHP-Versions:
6+
# ubuntu-12.04 -> PHP 5.3 (precise) LTS
7+
# ubuntu-14.04 -> PHP 5.5 (trusty) LTS
8+
# ubuntu-15.04 -> PHP 5.6 (vivid)
9+
# ubuntu-15.10 -> PHP 5.6 (wily)
10+
# ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial) LTS
11+
# centos-7 -> PHP 5.4
12+
# debian-7 -> PHP 5.4 (wheezy)
13+
# debian-8 -> PHP 5.6 and 7.x (jessie)
14+
# debian-9 -> PHP 5.6 and 7.0 (stretch)
15+
#
16+
# Apache:
17+
# webdevops/php-apache:ubuntu-12.04
18+
# webdevops/php-apache:ubuntu-14.04
19+
# webdevops/php-apache:ubuntu-15.04
20+
# webdevops/php-apache:ubuntu-15.10
21+
# webdevops/php-apache:ubuntu-16.04
22+
# webdevops/php-apache:ubuntu-16.04-php7
23+
# webdevops/php-apache:centos-7
24+
# webdevops/php-apache:debian-7
25+
# webdevops/php-apache:debian-8
26+
# webdevops/php-apache:debian-8-php7
27+
# webdevops/php-apache:debian-9
28+
# webdevops/php-apache:debian-9-php7
29+
#
30+
# Nginx:
31+
# webdevops/php-nginx:ubuntu-12.04
32+
# webdevops/php-nginx:ubuntu-14.04
33+
# webdevops/php-nginx:ubuntu-15.04
34+
# webdevops/php-nginx:ubuntu-15.10
35+
# webdevops/php-nginx:ubuntu-16.04
36+
# webdevops/php-nginx:ubuntu-16.04-php7
37+
# webdevops/php-nginx:centos-7
38+
# webdevops/php-nginx:debian-7
39+
# webdevops/php-nginx:debian-8
40+
# webdevops/php-nginx:debian-8-php7
41+
# webdevops/php-nginx:debian-9
42+
# webdevops/php-nginx:debian-9-php7
43+
#
44+
# HHVM:
45+
# webdevops/hhvm-apache
46+
# webdevops/hhvm-nginx
47+
#
48+
#++++++++++++++++++++++++++++++++++++++
49+
50+
FROM webdevops/php-apache:ubuntu-14.04
51+
52+
ENV PROVISION_CONTEXT "development"
53+
54+
# Deploy scripts/configurations
55+
COPY etc/ /opt/docker/etc/
56+
COPY provision/ /opt/docker/provision/
57+
58+
RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
59+
&& /opt/docker/bin/control.sh provision.role boilerplate-main-development \
60+
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
61+
&& /opt/docker/bin/bootstrap.sh
62+
63+
# Configure volume/workdir
64+
RUN mkdir -p /app/
65+
WORKDIR /app/

‎Dockerfile.production‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# PHP application Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
#
5+
# PHP-Versions:
6+
# ubuntu-12.04 -> PHP 5.3 (precise) LTS
7+
# ubuntu-14.04 -> PHP 5.5 (trusty) LTS
8+
# ubuntu-15.04 -> PHP 5.6 (vivid)
9+
# ubuntu-15.10 -> PHP 5.6 (wily)
10+
# ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial) LTS
11+
# centos-7 -> PHP 5.4
12+
# debian-7 -> PHP 5.4 (wheezy)
13+
# debian-8 -> PHP 5.6 and 7.x (jessie)
14+
# debian-9 -> PHP 5.6 and 7.0 (stretch)
15+
#
16+
# Apache:
17+
# webdevops/php-apache:ubuntu-12.04
18+
# webdevops/php-apache:ubuntu-14.04
19+
# webdevops/php-apache:ubuntu-15.04
20+
# webdevops/php-apache:ubuntu-15.10
21+
# webdevops/php-apache:ubuntu-16.04
22+
# webdevops/php-apache:ubuntu-16.04-php7
23+
# webdevops/php-apache:centos-7
24+
# webdevops/php-apache:debian-7
25+
# webdevops/php-apache:debian-8
26+
# webdevops/php-apache:debian-8-php7
27+
# webdevops/php-apache:debian-9
28+
# webdevops/php-apache:debian-9-php7
29+
#
30+
# Nginx:
31+
# webdevops/php-nginx:ubuntu-12.04
32+
# webdevops/php-nginx:ubuntu-14.04
33+
# webdevops/php-nginx:ubuntu-15.04
34+
# webdevops/php-nginx:ubuntu-15.10
35+
# webdevops/php-nginx:ubuntu-16.04
36+
# webdevops/php-nginx:ubuntu-16.04-php7
37+
# webdevops/php-nginx:centos-7
38+
# webdevops/php-nginx:debian-7
39+
# webdevops/php-nginx:debian-8
40+
# webdevops/php-nginx:debian-8-php7
41+
# webdevops/php-nginx:debian-9
42+
# webdevops/php-nginx:debian-9-php7
43+
#
44+
# HHVM:
45+
# webdevops/hhvm-apache
46+
# webdevops/hhvm-nginx
47+
#
48+
#++++++++++++++++++++++++++++++++++++++
49+
50+
FROM webdevops/php-apache:ubuntu-14.04
51+
52+
ENV PROVISION_CONTEXT "production"
53+
54+
# Deploy scripts/configurations
55+
COPY etc/ /opt/docker/etc/
56+
COPY provision/ /opt/docker/provision/
57+
58+
RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
59+
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
60+
&& /opt/docker/bin/bootstrap.sh
61+
62+
# Configure volume/workdir
63+
RUN mkdir -p /app/
64+
WORKDIR /app/

‎LICENSE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
The MIT License (MIT)
22

3+
Copyright (c) 2015 WebDevOps
34
Copyright (c) 2015 Markus Blaschke
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy

‎Makefile‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,34 @@ stop:
2727
state:
2828
docker-compose ps
2929

30+
rebuild:
31+
docker-compose stop
32+
docker-compose rm --force app
33+
docker-compose build --no-cache
34+
docker-compose up -d
35+
3036
#############################
3137
# MySQL
3238
#############################
3339

3440
mysql-backup:
35-
docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh mysql
41+
docker-compose run --rm --no-deps app root bash /docker/bin/backup.sh mysql
3642

3743
mysql-restore:
38-
docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh mysql
44+
docker-compose run --rm --no-deps app root bash /docker/bin/restore.sh mysql
3945

4046
#############################
4147
# Solr
4248
#############################
4349

4450
solr-backup:
4551
docker-compose stop solr
46-
docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh solr
52+
docker-compose run --rm --no-deps app root bash /docker/bin/backup.sh solr
4753
docker-compose start solr
4854

4955
solr-restore:
5056
docker-compose stop solr
51-
docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh solr
57+
docker-compose run --rm --no-deps app root bash /docker/bin/restore.sh solr
5258
docker-compose start solr
5359

5460
#############################
@@ -62,20 +68,20 @@ build:
6268
bash bin/build.sh
6369

6470
clean:
65-
test -d code/typo3temp && { rm -rf code/typo3temp/*; }
71+
test -d app/typo3temp && { rm -rf app/typo3temp/*; }
6672

6773
bash:
68-
docker-compose run --rm main bash
74+
docker-compose run --rm app bash
6975

7076
root:
71-
docker-compose run --rm main root
77+
docker-compose run --rm app root
7278

7379
#############################
7480
# TYPO3
7581
#############################
7682

7783
scheduler:
78-
docker-compose run --rm main typo3/cli_dispatch.phpsh scheduler $(ARGS)
84+
docker-compose run --rm app typo3/cli_dispatch.phpsh scheduler $(ARGS)
7985

8086
#############################
8187
# Argument fix workaround

‎README.md‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dockerized TYPO3 project boilerplate
22

3-
[![latest v4.0.0](https://img.shields.io/badge/latest-v4.0.0-green.svg?style=flat)](https://github.com/webdevops/TYPO3-docker-boilerplate/releases/tag/4.0.0)
3+
[![latest v5.0.0](https://img.shields.io/badge/latest-v5.0.0-green.svg?style=flat)](https://github.com/webdevops/TYPO3-docker-boilerplate/releases/tag/5.0.0)
44
![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)
55
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/webdevops/typo3-docker-boilerplate.svg)](http://isitmaintained.com/project/webdevops/typo3-docker-boilerplate "Average time to resolve an issue")
66
[![Percentage of issues still open](http://isitmaintained.com/badge/open/webdevops/typo3-docker-boilerplate.svg)](http://isitmaintained.com/project/webdevops/typo3-docker-boilerplate "Percentage of issues still open")
@@ -13,7 +13,7 @@ Supports:
1313
- PHP-FPM (with Xdebug)
1414
- MySQL, MariaDB or PerconaDB
1515
- PostgreSQL
16-
- Solr (disabled, with TYPO3 CMS EXT:solr configuration as example)
16+
- Solr (disabled, without configuration)
1717
- Elasticsearch (disabled, without configuration)
1818
- Redis (disabled)
1919
- Memcached (disabled)
@@ -22,16 +22,19 @@ Supports:
2222
- Support for `TYPO3_CONTEXT` and `FLOW_CONTEXT` for TYPO3, FLOW, NEOS.
2323
- maybe more later...
2424

25-
This Docker boilerplate based on the best practises and don't use too much magic.
26-
Configuration of each docker container is available in the `docker/` directory - feel free to customize.
25+
This Docker boilerplate is based on the [Docker best practices](https://docs.docker.com/articles/dockerfile_best-practices/) and doesn't use too much magic. Configuration of each docker container is available in the `docker/` directory - feel free to customize.
2726

28-
Warning: There may be issues when using it in production - if you have any success stories please contact me.
27+
This boilerplate can also be used for any other web project. Just customize the makefile for your needs.
2928

30-
You can use my [Vagrant Development VM](https://github.com/webdevops/vagrant-development) for this Docker boilerplate, eg. for easy creating new boilerplate installations with an easy shell command: `ct docker:create directory`
29+
*Warning: There may be issues when using it in production.*
30+
31+
If you have any success stories please contact me.
32+
33+
You can use my [Vagrant Development VM](https://github.com/mblaschke/vagrant-development) for this Docker boilerplate, e.g. for easily creating new boilerplate installations with short shell command: `ct docker:create directory`.
3134

3235
## Table of contents
3336

34-
- [Installation and requirements](/documentation/INSTALL.md)
37+
- [First steps / Installation and requirements](/documentation/INSTALL.md)
3538
- [Updating docker boilerplate](/documentation/UPDATE.md)
3639
- [Customizing](/documentation/CUSTOMIZE.md)
3740
- [Services (Webserver, MySQL... Ports, Users, Passwords)](/documentation/SERVICES.md)
@@ -45,14 +48,17 @@ You can use my [Vagrant Development VM](https://github.com/webdevops/vagrant-dev
4548

4649
This Docker layout is based on https://github.com/denderello/symfony-docker-example/
4750

48-
Thanks for support, ideas and issues ...
51+
Thanks for your support, ideas and issues.
4952
- [Ingo Pfennigstorf](https://github.com/ipf)
5053
- [Florian Tatzel](https://github.com/PanadeEdu)
5154
- [Josef Florian Glatz](https://github.com/jousch)
5255
- [Ingo Müller](https://github.com/IngoMueller)
5356
- [Benjamin Rau](https://twitter.com/benjamin_rau)
5457
- [Philipp Kitzberger](https://github.com/Kitzberger)
5558
- [Stephan Ferraro](https://github.com/ferraro)
59+
- [Cedric Ziel](https://github.com/cedricziel)
60+
- [Elmar Hinz](https://github.com/elmar-hinz)
61+
5662

5763
Thanks to [cron IT GmbH](http://www.cron.eu/) for inspiration.
5864

‎code/.gitkeep‎ renamed to ‎app/.gitkeep‎

File renamed without changes.

0 commit comments

Comments
 (0)