Skip to content

Commit

Permalink
added docker-compose.override
Browse files Browse the repository at this point in the history
  • Loading branch information
igor-chepurnoi committed Jan 25, 2017
1 parent 9912ca0 commit 72320e5
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ tests/_output/*
tests/_support/_generated

/.env
/docker-compose.override.yml
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ You can install the application using the following commands:
```sh
composer create-project --no-install yii2mod/base yii2mod-base
cd yii2mod-base
cp .env.dist .env
cp .env{.dist,}
cp docker-compose.override.yml{.dist,}
docker-compose up --build
```
It may take some minutes to download the required docker images. When
Expand Down
2 changes: 1 addition & 1 deletion data/docker/web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.1-apache
FROM php:7.1.1-apache

MAINTAINER Igor Chepurnoi <[email protected]>

Expand Down
8 changes: 8 additions & 0 deletions docker-compose.override.yml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: '2'
services:
web:
ports:
- "80:80"
db_admin:
ports:
- "8088:80"
4 changes: 0 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,13 @@ services:
HOST_UID: ${HOST_UID}
volumes:
- .:/var/www/html
ports:
- "80:80"
links:
- db
depends_on:
- db

db_admin:
build: ./data/docker/dbadmin
ports:
- "8088:80"
links:
- db
depends_on:
Expand Down

0 comments on commit 72320e5

Please sign in to comment.