From 1a2ddaabe61e319a10ad9f92b8e9f35b9253ae77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 21:30:02 +0000 Subject: [PATCH 1/2] Bump django from 4.2.15 to 4.2.16 Bumps [django](https://github.com/django/django) from 4.2.15 to 4.2.16. - [Commits](https://github.com/django/django/compare/4.2.15...4.2.16) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 6285a1b8..9a1ca392 100644 --- a/poetry.lock +++ b/poetry.lock @@ -362,13 +362,13 @@ files = [ [[package]] name = "django" -version = "4.2.15" +version = "4.2.16" description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." optional = false python-versions = ">=3.8" files = [ - {file = "Django-4.2.15-py3-none-any.whl", hash = "sha256:61ee4a130efb8c451ef3467c67ca99fdce400fedd768634efc86a68c18d80d30"}, - {file = "Django-4.2.15.tar.gz", hash = "sha256:c77f926b81129493961e19c0e02188f8d07c112a1162df69bfab178ae447f94a"}, + {file = "Django-4.2.16-py3-none-any.whl", hash = "sha256:1ddc333a16fc139fd253035a1606bb24261951bbc3a6ca256717fa06cc41a898"}, + {file = "Django-4.2.16.tar.gz", hash = "sha256:6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad"}, ] [package.dependencies] From b59dc776128711aca4baf6dccac0b605a174ea2d Mon Sep 17 00:00:00 2001 From: Rasmus Selsmark Date: Sun, 27 Oct 2024 09:30:51 +0100 Subject: [PATCH 2/2] Added Docker Compose for ARM64, and removed obsolete version field --- .github/CONTRIBUTING.md | 3 ++- docker-compose.arm64.yml | 11 +++++++++++ docker-compose.yml | 2 -- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 docker-compose.arm64.yml diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b657ff2e..6fbf3b25 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -13,7 +13,8 @@ You are more than welcome to contribute to the system. This guide documents how - The setup adheres to the [twelve-factor-app][12f] principles. To get a local development configuration, copy the file `.env.example` to `.env` -- Run `docker compose up` to start your local system. +- Run `docker compose up` to start your local system. + (If on Apple Silicon machine, run `docker compose -f docker-compose.yml -f docker-compose.arm64.yml up --build`) - Run `docker compose run web ./manage.py get_live_data` to download public data and insert it into your local database. diff --git a/docker-compose.arm64.yml b/docker-compose.arm64.yml new file mode 100644 index 00000000..4f975e7f --- /dev/null +++ b/docker-compose.arm64.yml @@ -0,0 +1,11 @@ +# use this file as override, if on Arm64 architecture, e.g. Mac M1 +# example commands: +# - docker compose -f docker-compose.yml -f docker-compose.arm64.yml up --build +# - docker compose -f docker-compose.yml -f docker-compose.arm64.yml run --build web ./manage.py test +services: + selenium: + image: seleniarm/standalone-chromium + networks: + - webnet + ports: + - "4444:4444" diff --git a/docker-compose.yml b/docker-compose.yml index 94630806..45117fe0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.3" - services: web: build: .