multiarch

.env.sample

@@ -8,16 +8,19 @@ FLAVOUR=classic
 
 # Different flavours/forks or architectures may require different builds of bonfire:
 # for ARM (manual build):
-APP_DOCKER_IMAGE=bonfirenetworks/bonfire:latest-${FLAVOUR}-aarch64
+# APP_DOCKER_IMAGE=bonfirenetworks/bonfire:latest-${FLAVOUR}-aarch64
 # for x86 (built by CI):
 APP_DOCKER_IMAGE=bonfirenetworks/bonfire:latest-${FLAVOUR}-amd64
 # multi-arch image (built by CI, but currently not working): 
 #APP_DOCKER_IMAGE=bonfirenetworks/bonfire:latest-${FLAVOUR}
 
 # note that different flavours or architectures may require different postgres builds:
-DB_DOCKER_IMAGE=postgres:12-alpine
-#DB_DOCKER_IMAGE=postgis/postgis:12-3.3-alpine
-#DB_DOCKER_IMAGE=ghcr.io/baosystems/postgis:12-3.3
+# For ARM or x86:
+DB_DOCKER_IMAGE=ghcr.io/baosystems/postgis:12-3.3
+# for x86:
+# DB_DOCKER_IMAGE=postgis/postgis:12-3.3-alpine
+# multiarch (but doesn't have required Postgis extension)
+#DB_DOCKER_IMAGE=postgres:12-alpine
 
 # enter your instance's domain name
 DOMAIN=bonfire.example.com
@@ -76,6 +79,9 @@ LOG_LEVEL=info
 # GEOLOCATE_OPENCAGEDATA=
 # GITHUB_TOKEN=xyz
 
+# ORCID_CLIENT_ID=
+# ORCID_CLIENT_SECRET=
+
 # ====================================
 # these secrets will be autogenerated/managed by abra and docker"
 SECRET_POSTGRES_PASSWORD_VERSION=v1

README.md

@@ -16,7 +16,7 @@ A [coop-cloud](https://coopcloud.tech) recipe for deploying [Bonfire](https://bo
 ## Basic usage
 
 1. Install [`abra`] on your computer
-2. Prepare your server with `abra server add --provision your-server.domain.name server_username 22`
+2. Prepare your server with `abra server add your-server.domain.name`
 3. Deploy the [`coop-cloud/traefik`] proxy if you haven't already
 3. `abra app new --secrets bonfire` 
 4. `abra app config your-server.domain.name` to check and edit the config (there are comments to explain the different options)

compose.yml

@@ -71,6 +71,9 @@ services:
       - UPLOADS_S3_SCHEME
       - UPLOADS_S3_URL
       
+      - ORCID_CLIENT_ID
+      - ORCID_CLIENT_SECRET
+      
     secrets:
       - postgres_password
       - secret_key_base