Skip to content

Commit 2c61803

Browse files
committed
Readme: added more tips, synchronize
1 parent 656bae7 commit 2c61803

2 files changed

Lines changed: 42 additions & 9 deletions

File tree

‎README.md‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Great LAMP devstack based on **Docker** & **Docker Compose** for you home progra
1515
- PHP 7.1 + Composer + PHPMailer
1616
- PHP 5.6 + Composer + PHPMailer
1717
- NodeJS 6.7.x + NPM 3.10.x
18-
- MariaDB 10.1.x
18+
- MariaDB 10.1
19+
- PostgreSQL 9.6
1920
- Adminer 4.2.5
2021

2122
## Install
@@ -54,29 +55,57 @@ I have prepared docker configuration file for you. You can [download it here](ht
5455
wget https://raw.githubusercontent.com/dockette/devstack/master/docker-compose.yml
5556
```
5657
57-
If you didn't changed `DEVSTACK_DOCKER` varible, you should place your `docker-compose.yml` file to your user's folder `~/.devstack/docker-compose.yml`.
58+
If you didn't change the `DEVSTACK_DOCKER` variable, you should place your `docker-compose.yml` file to your user's folder `~/.devstack/docker-compose.yml`.
5859
59-
After you've followed install section, your devstack should be prepared. One thing left, you have to configure your devstack.
60+
After you've followed install section, your devstack should be well prepared. One thing left, you should configure your devstack (passwords, folders, etc).
6061
6162
You should:
62-
- setup your [**data homeland**](https://github.com/dockette/devstack/blob/master/docker-compose.yml#L98-L100)
63-
- setup mysql [**root password**](https://github.com/dockette/devstack/blob/master/docker-compose.yml#L92-L93)
63+
- setup your [**data homeland**](https://github.com/dockette/devstack/blob/master/docker-compose.yml#L100-L102)
64+
- setup MySQL [**root password**](https://github.com/dockette/devstack/blob/master/docker-compose.yml#L71-L73)
65+
- setup PostgreSQL [**root password**](https://github.com/dockette/devstack/blob/master/docker-compose.yml#L93-L95)
6466
6567
### Userdirs
6668
6769
There are two kind of users inside these containers, **root** (main unix user) and **dfx** (special user with uid 1000 in all `dockette` based images).
6870
69-
You can find it in docker-compose.yml [file in section/container](https://github.com/dockette/devstack/blob/master/docker-compose.yml#L105-L109).
71+
You can find it in docker-compose.yml [file in section/container](https://github.com/dockette/devstack/blob/master/docker-compose.yml#L107-L113).
7072
7173
On the containers startup, your `users dir` are attached to `php7`, `php56`, `nodejs` containers. You could create your own `.bash_profile`, `.bashrc` files
7274
for easier manipulation inside docker containers.
7375
74-
There used to be a skeleton in ubuntu/debian/mint system.
76+
[**TIP**] There used to be a skeleton in ubuntu/debian/mint system.
7577
7678
```sh
7779
cp /etc/skel/.bashrc <path-to-dfx-userdir>/.bashrc
7880
```
7981

82+
### PHP
83+
84+
PHP container provide a few environment variables you can override:
85+
86+
#### `xdebug`
87+
88+
| Key | Value |
89+
|-------------------|--------------------------------|
90+
| `PHP_IDE_CONFIG` | serverName=devstack.webserver |
91+
| `XDEBUG_CONFIG` | idekey=PHPSTORM |
92+
93+
#### `phpmailer`
94+
95+
Phpmailer store all mails send via `mail()` function to `/srv/mail` folder by default. You can change it.
96+
97+
| Key | Value |
98+
|-------------------|------------|
99+
| `PHPMAILER_PATH` | /srv/mail |
100+
101+
### MySQL / MariaDB
102+
103+
MariaDB's default root password is `root`. You should change it.
104+
105+
### PostgreSQL
106+
107+
PostgreSQL's default root password is `root`. You should change it.
108+
80109
## Hosts
81110

82111
By default is devstack available on domains:

‎docker-compose.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ services:
6969
- ./data/mariadb:/var/lib/mysql
7070

7171
environment:
72+
# Change in your devstack!
7273
- MYSQL_ROOT_PASSWORD=root
7374

7475
adminer:
@@ -90,6 +91,7 @@ services:
9091
- ./data/postgres:/var/lib/postgresql/data
9192

9293
environment:
94+
# Change in your devstack!
9395
- POSTGRES_PASSWORD=root
9496

9597
data:
@@ -103,9 +105,11 @@ services:
103105
image: busybox
104106

105107
volumes:
106-
# It's root's home folder. You can store here .npm, .composer cache etc.
108+
# It's root's home folder.
109+
# You can store here .npm, .composer cache etc.
107110
- ./data/root-dir:/root
108-
# It's root's home folder. You can store here .npm, .composer cache etc.
111+
# It's dfx's home folder.
112+
# You can store here .npm, .composer cache etc.
109113
- ./data/dfx-dir:/home/dfx
110114

111115
networks:

0 commit comments

Comments
 (0)