Compare commits

...

6 Commits

Author SHA1 Message Date
380178e6fa Merge pull request #429 from philtrep/mysql-bind-port
Added mysql change port bind documentation
2016-11-14 11:34:02 -05:00
be64b54606 Merge pull request #428 from laradock/appleboy-patch-1
fixed #420 remove phpmyadmin volume setting.
2016-11-14 11:32:55 -05:00
cbeeb48aa1 Added mysql change port binnd documentation 2016-11-14 11:24:28 -05:00
7e2814168a fixed #420 remove phpmyadmin volume setting. 2016-11-14 23:45:52 +08:00
5e9ae56a7f Merge pull request #419 from laradock/yarn
Revert #418 and fix install yarn package management.
2016-11-10 09:32:19 -05:00
5d98e78dba Revert #418 and fix install yarn package management.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-11-10 10:23:49 +08:00
3 changed files with 13 additions and 5 deletions

View File

@ -61,6 +61,7 @@ Laradock is configured to run Laravel Apps by default, and it can be modifyed to
- [Access workspace via ssh](#Workspace-ssh) - [Access workspace via ssh](#Workspace-ssh)
- [MySQL access from host](#MySQL-access-from-host) - [MySQL access from host](#MySQL-access-from-host)
- [MySQL root access](#MySQL-root-access) - [MySQL root access](#MySQL-root-access)
- [Change MySQL port](#Change-MySQL-port)
- [Use custom Domain](#Use-custom-Domain) - [Use custom Domain](#Use-custom-Domain)
- [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install) - [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install)
- [Install Prestissimo](#Install-Prestissimo) - [Install Prestissimo](#Install-Prestissimo)
@ -1164,6 +1165,17 @@ The default username and password for the root mysql user are `root` and `root `
4 - Run any commands `show databases`, `show tables`, `select * from.....`. 4 - Run any commands `show databases`, `show tables`, `select * from.....`.
<a name="Change-MySQL-port"></a>
### Change MySQL port
Modify the `mysql/my.cnf` file to set your port number, `1234` is used as an example.
```
[mysqld]
port=1234
```
If you need <a href="#MySQL-access-from-host">MySQL access from your host</a>, do not forget to change the internal port number (`"3306:3306"` -> `"3306:1234"`) in the docker-compose config file.
<a name="Use-custom-Domain"></a> <a name="Use-custom-Domain"></a>
### Use custom Domain (instead of the Docker IP) ### Use custom Domain (instead of the Docker IP)

View File

@ -36,8 +36,6 @@ services:
ports: ports:
- "2222:22" - "2222:22"
tty: true tty: true
environment:
- PATH=$PATH:/home/laradock/.yarn/bin:/var/www/vendor/bin:/home/laradock/.nvm/versions/node/v7.1.0/bin
### PHP-FPM Container ####################################### ### PHP-FPM Container #######################################
@ -282,8 +280,6 @@ services:
MYSQL_USER: homestead MYSQL_USER: homestead
MYSQL_PASSWORD: secret MYSQL_PASSWORD: secret
MYSQL_ROOT_PASSWORD: root MYSQL_ROOT_PASSWORD: root
volumes:
- phpmyadmin
ports: ports:
- "8080:80" - "8080:80"
links: links:

View File

@ -191,7 +191,7 @@ ARG INSTALL_YARN=false
ENV INSTALL_YARN ${INSTALL_YARN} ENV INSTALL_YARN ${INSTALL_YARN}
RUN if [ ${INSTALL_YARN} = true ]; then \ RUN if [ ${INSTALL_YARN} = true ]; then \
export PATH=$PATH:/home/laradock/.nvm/versions/node/v7.1.0/bin && \ [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && \
curl -o- -L https://yarnpkg.com/install.sh | bash && \ curl -o- -L https://yarnpkg.com/install.sh | bash && \
echo "" >> ~/.bashrc && \ echo "" >> ~/.bashrc && \
echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \ echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \