diff --git a/README.md b/README.md index a5d97a7..f09eb19 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,8 @@ These compose files make a few assumptions: ## 📚 Workflow The intended workflow is as follows: -1. Clone the cookbook repository locally ```git clone git@github.com:nickyeoman/docker-compose-cookbooks.git /git-repos/docker-compose-cookbooks``` +1. Clone the cookbook repository locally ```git clone git@github.com:nickyeoman/docker-compose-cookbooks.git /docker-compose-cookbooks``` 2. Change to the directory ```cd /git-repos/docker-compose-cookbooks``` -3. Run the helper cli wizard: ```bash helper.bash``` -4. Commit the new project to git. You will likely want to override a number of things in the project folder, such as networks. @@ -29,10 +27,6 @@ You will likely want to override a number of things in the project folder, such Here is an example of how your project's docker-compose file might look: ```yaml -networks: - proxy: - external: true - services: proxy: extends: @@ -42,12 +36,20 @@ services: - .env networks: - proxy + +networks: + proxy: + external: true ``` with the .env file: ```text -COOKBOOK=/git-repos/docker-compose-cookbooks +COOKBOOK=/docker-compose-cookbooks +COMPOSE_PROJECT_NAME=www-4lt-ca +TZ=America/Vancouver +VOL_CONFIG_PATH=/websites/www-4lt-ca/config +VOL_PATH=/websites/www-4lt-ca/data ``` Now use ```docker compose up -d``` to start the project. diff --git a/mariadb/docker-compose.yml b/mariadb/docker-compose.yml index 57b3fcb..cba82c7 100644 --- a/mariadb/docker-compose.yml +++ b/mariadb/docker-compose.yml @@ -1,4 +1,5 @@ services: + mariadb: image: ${MARIADB_IMAGE:-mariadb:latest} restart: unless-stopped diff --git a/mariadb/sample-extends.yml b/mariadb/sample-extends.yml index ed811eb..bf0f4d4 100644 --- a/mariadb/sample-extends.yml +++ b/mariadb/sample-extends.yml @@ -1,5 +1,4 @@ services: - mariadb: extends: file: ${COOKBOOK}/mariadb/docker-compose.yml diff --git a/phpcontainer/sample-extends.yml b/phpcontainer/sample-extends.yml index e5fa0d4..31aabf5 100644 --- a/phpcontainer/sample-extends.yml +++ b/phpcontainer/sample-extends.yml @@ -1,10 +1,10 @@ -version: '3.4' - services: + php-apache: extends: file: ${COOKBOOK}/phpcontainer/docker-compose.yml service: php-apache volumes: - "./project:/data" - - "./config/php.ini:/usr/local/etc/php/php.ini" \ No newline at end of file + - "./config/php.ini:/usr/local/etc/php/php.ini" + \ No newline at end of file