From 7d0165588cd48a46eb5ad9665c09bd019bac3594 Mon Sep 17 00:00:00 2001 From: alstepan Date: Wed, 27 Nov 2024 20:10:14 +0000 Subject: [PATCH] Fixed docker-compose.yml and CONTRIBUTING.md to run on Apple Silicon M1 (Issue #2149) --- CONTRIBUTING.md | 11 +++++++---- docker-compose.yml | 5 ++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8eef597e3..89d3957fb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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. @@ -49,6 +55,3 @@ To update the doc site, check out the tag first. git checkout v1.2.3 sbt docs/publishMicrosite ``` - - - diff --git a/docker-compose.yml b/docker-compose.yml index 998912a54..06d174b3b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.1' +version: "3.1" services: postgres: @@ -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