Skip to content

Commit 10a13ab

Browse files
committed
Merge branch 'develop'
2 parents b769ec2 + 1e5fc6b commit 10a13ab

File tree

9 files changed

+65
-10
lines changed

9 files changed

+65
-10
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ create-cms-project:
1010
create-neos-project:
1111
bash bin/create-project.sh neos
1212

13+
create-symfony-project:
14+
bash bin/create-project.sh symfony
15+
1316
#############################
1417
# MySQL
1518
#############################

README-NEOS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ or
1515
$ touch code/.gitkeep
1616

1717

18-
And change DOCUMENT_ROOT in docuer-env.yml:
18+
And change `DOCUMENT_ROOT` in `docker-env.yml`:
1919

2020
DOCUMENT_ROOT=code/Web/
2121

22-
Feel free to modify your NEOS installation in your htdocs (a shared folder of Docker),
22+
Feel free to modify your NEOS installation in your `code` (a shared folder of Docker),
2323
most of the time there is no need to enter any Docker container.
2424

2525
## NEOS cli runner
2626

27-
You can run one-shot command inside the `TYPO3` service container:
27+
You can run one-shot command inside the `main` service container:
2828

2929
$ docker-compose run --rm code flow core:setfilepermissions
3030

README-OTHER.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[<-- Back to main section](README.md)
2+
3+
# Running any php based project
4+
5+
## Create project
6+
7+
- Put your project files into `code/`
8+
- If needed modify `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `docker-env.yml`
9+
- You're done - really
10+
11+
## Cli runner
12+
13+
You can run one-shot command inside the `main` service container:
14+
15+
$ docker-compose run --rm code any-php-file.php argument1 argument2
16+
17+
$ docker-compose run --rm code bash
18+
19+
Webserver is available at Port 8000

README-SYMFONY.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[<-- Back to main section](README.md)
2+
3+
# Running SYMFONY
4+
5+
## Create SYMFONY project
6+
7+
$ make create-symfony-project
8+
9+
And change `DOCUMENT_ROOT` and `DOCUMENT_ROOT` in `docker-env.yml`:
10+
11+
DOCUMENT_ROOT=code/web/
12+
DOCUMENT_INDEX=app_dev.php
13+
14+
## SYMFONY cli runner
15+
16+
You can run one-shot command inside the `main` service container:
17+
18+
$ docker-compose run --rm code php code/app/console
19+
20+
$ docker-compose run --rm code bash
21+
22+
Webserver is available at Port 8000

README-TYPO3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ or
1515
$ touch htdocs/FIRST_INSTALL code/.gitkeep
1616

1717

18-
Feel free to modify your TYPO3 installation in your htdocs (a shared folder of Docker),
18+
Feel free to modify your TYPO3 installation in your `code` (a shared folder of Docker),
1919
most of the time there is no need to enter any Docker container.
2020

2121

2222
## TYPO3 cli runner
2323

24-
You can run one-shot command inside the `TYPO3` service container:
24+
You can run one-shot command inside the `main` service container:
2525

2626
$ docker-compose run --rm code typo3/cli_dispatch.phpsh scheduler
2727

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# Dockerized TYPO3, FLOW and NEOS project boilerplate
1+
# Dockerized PHP web project boilerplate
22

33
This is a boilerplate utilizing Docker based with support
4-
for **TYPO3_CONTEXT** and **FLOW_CONTEXT** for TYPO3, FLOW and NEOS projects.
4+
for **TYPO3_CONTEXT** and **FLOW_CONTEXT** for TYPO3, FLOW, NEOS.
5+
It also supports Symfony and any other PHP base project.
56

67
Supports:
78

@@ -84,6 +85,8 @@ Now create the project:
8485

8586
- [Create new TYPO3](README-TYPO3.md)
8687
- [Create new NEOS](README-NEOS.md)
88+
- [Create new SYMFONY](README-SYMFONY.md)
89+
- [Running any php based project](README-OTHER.md)
8790

8891
For an existing project just put your files into code/ folder or use git to clone your project into code/.
8992

bin/create-project.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ if [ "$#" -ne 1 ]; then
1313
fi
1414

1515
mkdir -p -- "$CODE_DIR/"
16+
chmod 777 "$CODE_DIR/"
1617

1718
rm -f -- "$CODE_DIR/.gitkeep"
1819

@@ -31,6 +32,15 @@ case "$1" in
3132
"neos")
3233
execInDir "$CODE_DIR" "composer create-project typo3/neos-base-distribution \"$CODE_DIR\""
3334
;;
35+
36+
###################################
37+
## SYMFONY
38+
###################################
39+
"symfony")
40+
curl -LsS http://symfony.com/installer > /tmp/symfony.$$.phar
41+
execInDir "$CODE_DIR" "php /tmp/symfony.$$.phar new '$CODE_DIR'"
42+
rm -f -- /tmp/symfony.$$.phar
43+
;;
3444
esac
3545

3646
touch -- "$CODE_DIR/.gitkeep"

docker/httpd/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
FROM httpd:2.4
22

3-
ENV DEBIAN_FRONTEND noninteractive
4-
53
ADD conf/vhost.conf /usr/local/apache2/conf/.docker-vhost.conf.original
64
ADD entrypoint.sh /entrypoint.sh
75

docker/main/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN bash /opt/docker/install.sh
1010
EXPOSE 9000
1111

1212
VOLUME /docker/
13-
WORKDIR /docker/
13+
WORKDIR /docker/code/
1414

1515
ENTRYPOINT ["/opt/docker/entrypoint.sh"]
1616
CMD ["supervisord"]

0 commit comments

Comments
 (0)