Skip to content

Commit

Permalink
Merge pull request #2151 from alstepan/fix-docker-compose-for-apple-s…
Browse files Browse the repository at this point in the history
…ilicon

Fix for Issue #2149
  • Loading branch information
jatcwang authored Nov 28, 2024
2 parents 472eb3e + 7d01655 commit 75d021c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
11 changes: 7 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ which you can spin up using docker-compose:
docker-compose up -d --force-update
```

or

```
docker compose up -d --force-recreate
```

After that, in SBT you can run `test` to run tests, and `makeSite` to build the doc site

If you're editing code generation related code, you should reload the SBT project and then run the `freeGen2` SBT task
Expand All @@ -21,7 +27,7 @@ before compiling or running tests.
## Avoiding internal cyclic module dependencies

For end users, doobie provides the aliases for high and low level APIs
such as `doobie.hi.HC`, `doobie.free.FPS`.
such as `doobie.hi.HC`, `doobie.free.FPS`.
Due to how the module depends on one another, internally in doobie we cannot use
these aliases because it'll lead to cyclic module dependencies and cause runtime errors.

Expand Down Expand Up @@ -49,6 +55,3 @@ To update the doc site, check out the tag first.
git checkout v1.2.3
sbt docs/publishMicrosite
```



5 changes: 2 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.1'
version: "3.1"

services:
postgres:
Expand All @@ -16,9 +16,8 @@ services:
limits:
memory: 500M


mysql:
image: mysql:8.0-debian
image: mysql:8.0
environment:
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: world
Expand Down

0 comments on commit 75d021c

Please sign in to comment.