Merge branch 'master' into 1116-bugadmin-invitation-af-personer-til-e…

…n-aktivitet-liste-af-afdelinger-indeholder-også-lukkede-afdelinger

.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.

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"

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.3"
-
 services:
   web:
     build: .