Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Emulate x86 so local dev is possible on arm64 machines #1142

Merged
merged 5 commits into from
Sep 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Other useful resources:

### Running E2E Tests

1. `make e2e-tests`
1. `make e2e-tests` (⚠️ these do not work on Apple Silicon at this time)
1. Individual test results will appear in your terminal but if you'd like to watch them in real-time, simply VNC into the running tests via `localhost:5900`, e.g., Mac OSX users simply `open vnc://localhost:5900` and use `secret` as the password. Other operating systems may require installing a separate VNC Viewer tool.

To run a single E2E spec file, put its path (relative to the repo root) into the `TEST_SPECS` environment variable (don't forget to `export` it), or pass it as an option to `make e2e-tests` as follows:
Expand Down
5 changes: 5 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# https://docs.docker.com/compose/compose-file
# https://github.com/compose-spec/compose-spec/blob/master/spec.md
version: '3.5'
services:
ui-builder:
Expand Down Expand Up @@ -29,6 +30,7 @@ services:
- ENVIRONMENT=development
image: lf-app
container_name: lf-app
platform: linux/amd64
depends_on:
- db
- mail
Expand Down Expand Up @@ -120,6 +122,7 @@ services:
ld-db:
image: mysql:5.7
container_name: ld-db
platform: linux/amd64
# To access the MySQL database via localhost:3306 on your dev machine (e.g., in VS Code), uncomment the "ports" config below
# Note that if you're running MySQL on your dev machine already, change the first number to something else, like 3307 and access localhost:3307
# ports:
Expand Down Expand Up @@ -186,6 +189,7 @@ services:
dockerfile: docker/app-for-e2e/Dockerfile
image: app-for-e2e
container_name: app-for-e2e
platform: linux/amd64
depends_on:
- db
- mail
Expand All @@ -207,6 +211,7 @@ services:
dockerfile: docker/test-php/Dockerfile
image: test-php
container_name: test-php
platform: linux/amd64
depends_on:
- db
- mail
Expand Down