From c082856218e5f0ee9762fd5851cda4c2142963e6 Mon Sep 17 00:00:00 2001 From: jamesrwarren Date: Mon, 6 Jan 2025 13:35:36 +0000 Subject: [PATCH] small fixes to readme for first creation of app --- README.md | 9 ++++++--- docker-compose.override.yml | 4 ---- docker-compose.yml | 18 ------------------ 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index af41da0de0..1c32c17af9 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,13 @@ If developing the app then ensure you have [pre-commit](https://pre-commit.com/) #### M1 macOS Monterey ≥ 12.2 | Intel macOS Monterey ≥ 12.3 Docker settings -* `Docker preferences -> Experimental Features -> tick 'Use the new Virtualization framework'` -* `Docker preferences -> Experimental Features -> tick 'Enable VirtioFS accelerated directory sharing'` +* `Docker settings -> General -> make sure 'Use the new Virtualization framework' is ticked` +* `Docker settings -> General -> tick 'VirtioFS' for file sharing` +* `Docker settings -> General -> untick 'Use Rosetta'` -Once both boxes are checked click `Apply & Restart` then run the `Make` command `make up-app-build` +Also in `Docker settings -> Resources`, make sure that you have at least 10gb of memory allocated or you may get performance issues. + +Once both boxes are checked click `Apply & Restart` then continue to follow the instructions below. ## Installation diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 4517123f28..feed89641c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -66,10 +66,6 @@ services: volumes: - ./htmltopdf/app.py:/app.py - synchronisation: - volumes: - - ./lambdas/functions/synchronisation/.aws-lambda-rie:/aws-lambda - mock-notify-api: volumes: - ./client/app/govuk-notifications.yaml:/tmp/govuk-notifications.yaml diff --git a/docker-compose.yml b/docker-compose.yml index abdfa7609f..e2173a8de9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -201,9 +201,6 @@ services: - DEFAULT_REGION=eu-west-1 - USE_SINGLE_REGION=1 - DEBUG=1 - - LAMBDA_EXECUTOR=docker - - LAMBDA_REMOVE_CONTAINERS="true" - - LAMBDA_FORWARD_URL=http://synchronisation:8080 wait-for-it: build: ./wait-for-it @@ -249,21 +246,6 @@ services: - 0.0.0.0 - --dynamic - synchronisation: - container_name: opg-synchronisation-lambda - build: - context: ./lambdas/functions/synchronisation - ports: - - 2080:8080 - environment: - AWS_REGION: eu-west-1 - AWS_ACCESS_KEY_ID: localstack - AWS_SECRET_ACCESS_KEY: localstack - DIGIDEPS_SYNC_ENDPOINT: https://frontend - SECRETS_PREFIX: local - LOCALSTACK_ENDPOINT: http://localstack:4566 - entrypoint: /aws-lambda/aws-lambda-rie /var/task/main - composer: image: composer:2.5.7 command: ["install"]