diff --git a/.gitignore b/.gitignore index 7e0e166..b673d20 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ tests/_output/* tests/_support/_generated /.env +/docker-compose.override.yml diff --git a/README.md b/README.md index 214dcd5..290c600 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/data/docker/web/Dockerfile b/data/docker/web/Dockerfile index 336d52f..c4b8e07 100644 --- a/data/docker/web/Dockerfile +++ b/data/docker/web/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.1-apache +FROM php:7.1.1-apache MAINTAINER Igor Chepurnoi diff --git a/docker-compose.override.yml.dist b/docker-compose.override.yml.dist new file mode 100644 index 0000000..aa64c18 --- /dev/null +++ b/docker-compose.override.yml.dist @@ -0,0 +1,8 @@ +version: '2' +services: + web: + ports: + - "80:80" + db_admin: + ports: + - "8088:80" diff --git a/docker-compose.yml b/docker-compose.yml index a060374..53ddfba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,8 +20,6 @@ services: HOST_UID: ${HOST_UID} volumes: - .:/var/www/html - ports: - - "80:80" links: - db depends_on: @@ -29,8 +27,6 @@ services: db_admin: build: ./data/docker/dbadmin - ports: - - "8088:80" links: - db depends_on: