Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Feb 11, 2022
2 parents 039c674 + 38df004 commit 981c273
Show file tree
Hide file tree
Showing 7 changed files with 193 additions and 224 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# nystudio107/matrixfacades Change Log

## 1.0.2 - 2022.02.11

### Changed

* Minor tweaks to the config so it can run with other local dev environments still running

## 1.0.1 - 2022.01.22

### Added
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ craft: up
nuke:
docker-compose down -v
rm -f cms/composer.lock
rm -f cms/composer.lock
rm -rf cms/vendor/
docker-compose up --build --force-recreate
ssh: up
docker exec -it ${CONTAINER} /bin/sh
update:
docker-compose down
rm -f cms/composer.lock
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ This is a project demonstrates how to improve authoring experience Matrix Façad

### Initial setup

You'll need [Docker desktop](https://www.docker.com/products/docker-desktop) for your platform installed to run devMode
in local development
You'll need [Docker desktop](https://www.docker.com/products/docker-desktop) for your platform installed to run this project

Ensure no other local development environments are running that might have port conflicts, then:
To get started:

1. Clone the git repo with:

Expand Down Expand Up @@ -39,7 +38,7 @@ quit PhpStorm or stop it from listening for Xdebug during the initial build.
4. Once the site is up and running (see below), navigate to:

```
http://localhost:8000
http://localhost:8888
```

The first time you do `make dev` it will be slow, because it has to build all of the Docker images.
Expand Down Expand Up @@ -164,7 +163,7 @@ This project uses Docker to shrink-wrap the devops it needs to run around the pr
To make using it easier, we're using a Makefile and the built-in `make` utility to create local aliases. You can run the
following from terminal in the project directory:

- `make dev` - starts up the local dev server listening on `http://localhost:8000/`
- `make dev` - starts up the local dev server listening on `http://localhost:8888/`
- `make clean` - shuts down the Docker containers, removes any mounted volumes (including the database), and then
rebuilds the containers from scratch
- `make update` - causes the project to update to the latest Composer dependencies
Expand Down
Loading

0 comments on commit 981c273

Please sign in to comment.