From 29af6dee8a35a811162ee426b90c3693399e5a80 Mon Sep 17 00:00:00 2001 From: Roni bhakta Date: Sat, 23 Nov 2024 19:19:22 +0530 Subject: [PATCH 1/2] Mac M2 Air docker support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit i have found that while doing docker compose build it was giving an error in .olbase becase it was not reading the extension properly i have made changes in the readme file to config the docker file correctly Co-Authored-By: Bharat Kalluri Co-Authored-By: Simon Shin <102877985+0simoo@users.noreply.github.com> Co-Authored-By: Albert Liu <3584830+A1Liu@users.noreply.github.com> Co-Authored-By: Lyuyongkang Yuan <60837226+AGoodName244@users.noreply.github.com> Co-Authored-By: Abhirup Pal Co-Authored-By: Abhishektharu <51353634+Abhishektharu@users.noreply.github.com> Co-Authored-By: Achorn <28990037+Achorn@users.noreply.github.com> Co-Authored-By: Adwait Salankar Co-Authored-By: Aeltumn <12281102+Aeltumn@users.noreply.github.com> Co-Authored-By: Raj Kamal Co-Authored-By: Alfonso Valenciana Co-Authored-By: ArgyleStoat <5643488+ArgyleStoat@users.noreply.github.com> Co-Authored-By: 0dysseas <31179964+0dysseas@users.noreply.github.com> Co-Authored-By: Arihant Pal <69034460+Ari1009@users.noreply.github.com> Co-Authored-By: Arun Teltia <43555219+ArunTeltia@users.noreply.github.com> Co-Authored-By: Ricardo Enrique Ortega Atayde <87588133+AtaydeEnrique@users.noreply.github.com> Co-Authored-By: Atul Bhosale <3390330+Atul9@users.noreply.github.com> Co-Authored-By: Ayush Kadam <59080746+Ayush1404@users.noreply.github.com> Co-Authored-By: Atharva Shinde <69111235+Atharva-Shinde@users.noreply.github.com> Co-Authored-By: arkiver <8437169+Arkiver2@users.noreply.github.com> Co-Authored-By: Subhanga Upadhyay <36729591+Azazel5@users.noreply.github.com> Co-Authored-By: Baasanbayar <64678629+BaasanbayarOverflow@users.noreply.github.com> Co-Authored-By: Bárbara Reis Silva <93334749+Barbara0608@users.noreply.github.com> Co-Authored-By: Biresh Biswas <90760974+Billa05@users.noreply.github.com> Co-Authored-By: Mickaël Schoentgen --- docker/README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker/README.md b/docker/README.md index 76beed4612f..f0dc767c0e9 100644 --- a/docker/README.md +++ b/docker/README.md @@ -59,6 +59,22 @@ Please use [Docker Desktop >= 4.3.0](https://docs.docker.com/desktop/mac/release If you are experiencing issues building JS, you may need to increase the RAM available to Docker. The defaults of 2GB ram and 1GB Swap are not enough. We recommend requirements of 4GB ram and 2GB swap. This resolved the error message of `Killed` when running `build-assets`. +### For Users of Macs Containing an m@ chip + +please use following commands to build docker on your local machine! to avoild compability issues. +``` +cd openlibrary +``` +``` +ls docker/ +``` +I notice from your directory listing that the file is named `Dockerfile.olbase`, not `Dockerfile.base`. +``` +docker build -f docker/Dockerfile.olbase -t openlibrary/olbase:latest . +``` +The error was occurring because we were trying to use `Dockerfile.base` when the actual file is named `Dockerfile.olbase`. Try running this corrected command and This should start building the base image correctly. Once this completes successfully, we can proceed with the docker compose build command. + + ### For All Users All commands are from the project root directory, where `compose.yaml` is (i.e. `path/to/your/forked/and/cloned/openlibrary`): From ebaefe398da16af7d5837e268ee19e4d437406c4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 13:54:10 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/README.md b/docker/README.md index f0dc767c0e9..e4109ccecf4 100644 --- a/docker/README.md +++ b/docker/README.md @@ -68,7 +68,7 @@ cd openlibrary ``` ls docker/ ``` -I notice from your directory listing that the file is named `Dockerfile.olbase`, not `Dockerfile.base`. +I notice from your directory listing that the file is named `Dockerfile.olbase`, not `Dockerfile.base`. ``` docker build -f docker/Dockerfile.olbase -t openlibrary/olbase:latest . ```