Skip to content

Commit 866a257

Browse files
authored
Merge branch 'develop' into GH-3710-fix-broken-documentation-links
2 parents 2d97088 + 438c96f commit 866a257

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ For more information about this file see also [Keep a Changelog](http://keepacha
2626

2727
### Fixed
2828
- Fixed broken pecanproject.github.io, pecan.gitbooks.io, and other outdated documentation links across book_source, tutorials, models, modules, web, and shiny files (#3710).
29+
- Added note to DEV-INTRO.md documenting Traefik workaround for Apple Silicon (ARM64) Macs: use `traefik:v2.11` with `platform: linux/arm64` to fix 404 errors (#3910)
2930
- Fixed `web/08-finished.php`: show database info instead of "Still running" when workflow folder doesn't exist locally (#3501).
3031

3132
### Changed

DEV-INTRO.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ cp docker-compose.dev.yml docker-compose.override.yml
6565

6666
You can now use the command `docker compose` to work with the containers setup for development. **The rest of this document assumes you have done this step.**
6767

68+
_Note for Apple Silicon (M1/M2/M3/M4) macOS users:_ The default Traefik image (`traefik:v2.9`) is built only for `linux/amd64` and cannot reliably communicate with the Docker socket when running under emulation on ARM64. This causes all web routes to return 404 errors. To fix this, add the following to your `docker-compose.override.yml` under `services:` and above `pecan:`:
69+
```sh
70+
traefik:
71+
image: traefik:v2.11
72+
platform: linux/arm64
73+
```
74+
6875
### First time setup
6976

7077
The steps in this section only need to be done the first time you start working with the stack in docker. After this is done you can skip these steps. You can find more detail about the docker commands in the [pecan documentation](https://pecanproject.github.io/pecan-documentation/latest/docker-index.html).

0 commit comments

Comments
 (0)