From 6becc6de6374e15f8124610a0b0ee37e861316f7 Mon Sep 17 00:00:00 2001 From: Jordan Havard <67948773+jordanhavard@users.noreply.github.com> Date: Mon, 15 Aug 2022 23:43:50 +1000 Subject: [PATCH] Fix docker dev links (#1470) Updated `docker-compose.local.yml` to `docker-compose.dev.yml` to reflect the correct docker files --- Makefile | 2 +- README.md | 2 +- docker-compose.dev.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dcdf3259..b3eabbc3 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ reset-installer: .PHONY: docker-test docker-test: - @docker compose -f docker-compose.local.yml up + @docker compose -f docker-compose.dev.yml up .PHONY: docker-clean docker-clean: diff --git a/README.md b/README.md index a37b86d7..2785b475 100755 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ make docker-test # **OR** with docker-compose directly -docker-compose -f docker-compose.yml -f docker-compose.local.yml up +docker-compose -f docker-compose.yml -f docker-compose.dev.yml up ``` Then go to `http://localhost`. If you're using dnsmasq, the `app` container is listening on `phpvms.test`, or you can add to your `/etc/hosts` file: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c0832997..828e4dcf 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,6 +1,6 @@ # # Run with either `make docker-test` or the following Docker command: -# docker-compose -f docker-compose.yml -f docker-compose.local.yml up +# docker-compose -f docker-compose.yml -f docker-compose.dev.yml up # --- services: