update drone-ci

Reviewed-on: #13

.drone.yml

@@ -2,37 +2,39 @@
 kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
-  - name: deployment
-    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
-    settings:
-      host: swarm-test.autonomic.zone
-      stack: example_com  # UPDATE ME
-      generate_secrets: true
-      purge: true
-      deploy_key:
-        from_secret: drone_ssh_swarm_test
-      networks:
-        - proxy
-    environment:
-      DOMAIN: example.swarm-test.autonomic.zone # UPDATE ME
-      STACK_NAME: example_com  # UPDATE ME
-      LETS_ENCRYPT_ENV: production
+- name: deployment
+  image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
+  settings:
+    host: swarm-test.autonomic.zone
+    stack: garage
+    generate_secrets: true
+    purge: true
+    deploy_key:
+      from_secret: drone_ssh_swarm_test
+    networks:
+    - proxy
+    compose: "compose.yml"
+  environment:
+    DOMAIN: garage.swarm-test.autonomic.zone
+    STACK_NAME: garage
+    LETS_ENCRYPT_ENV: production
+    SECRET_RPC_SECRET_VERSION: v1
 trigger:
   branch:
-    - main
+  - main
 ---
 kind: pipeline
 name: generate recipe catalogue
 steps:
-  - name: release a new version
-    image: plugins/downstream
-    settings:
-      server: https://build.coopcloud.tech
-      token:
-        from_secret: drone_abra-bot_token
-      fork: true
-      repositories:
-        - coop-cloud/auto-recipes-catalogue-json
+- name: release a new version
+  image: plugins/downstream
+  settings:
+    server: https://build.coopcloud.tech
+    token:
+      from_secret: drone_abra-bot_token
+    fork: true
+    repositories:
+    - toolshed/auto-recipes-catalogue-json
 
 trigger:
   event: tag

.env.sample

@@ -5,12 +5,13 @@ DOMAIN=garage.example.com
 LETS_ENCRYPT_ENV=production
 COMPOSE_FILE="compose.yml"
 
-SECRET_RPC_SECRET_VERSION=v1 # length=32 charset=hex
+SECRET_RPC_SECRET_VERSION=v1 # length=64 charset=hex
 
 # Changing the replication factor after initial deployment is not 
 # supported and requires deleting the existing cluster layout metadata.
 REPLICATION_FACTOR=2
 
+DATABASE_ENGINE=lmdb
 CONSISTENCY_MODE=consistent
 METADATA_FSYNC=false
 DATA_FSYNC=false
@@ -27,4 +28,4 @@ BLOCK_SIZE=1MiB # only increase if there is a fast network connection between no
 #LOCAL_FOLDER_DATA=/path/on/docker/host
 
 ## Enable Full Data Backups (not just metadata)
-# COMPOSE_FILE="$COMPOSE_FILE:compose.fullbackup.yml"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.fullbackup.yml"

abra.sh

@@ -1 +1 @@
-export GARAGE_CONF_VERSION=v4
+export GARAGE_CONF_VERSION=v7

compose.yml

@@ -3,12 +3,14 @@ version: "3.8"
 
 services:
   app:
-    image: dxflrs/garage:v2.1.0
+    image: dxflrs/garage:v2.3.0
+    hostname: "${DOMAIN}"
     configs:
       - source: garage_conf
         target: /etc/garage.toml
     secrets:
-      - rpc_secret
+      - source: rpc_secret
+        mode: 0600
     networks:
       - proxy
       - internal
@@ -24,13 +26,19 @@ services:
         - "traefik.tcp.routers.${STACK_NAME}-rpc.rule=HostSNI(`*`)"
         - "traefik.tcp.routers.${STACK_NAME}-rpc.entrypoints=garage-rpc"
         - "traefik.tcp.services.${STACK_NAME}-rpc.loadbalancer.server.port=3901"
-        - "coop-cloud.${STACK_NAME}.version=0.0.1+2.1.0"
+        - "coop-cloud.${STACK_NAME}.version=0.0.2+v2.3.0"
         - "backupbot.backup=true"
         - "backupbot.backup.pre-hook=/garage meta snapshot --all"
         - "backupbot.backup.path=/var/lib/garage/meta/snapshots/,/var/lib/garage/meta/cluster_layout,/var/lib/garage/meta/data_layout,/var/lib/garage/meta/node_key,/var/lib/garage/meta/node_key.pub"
     volumes:
       - "${LOCAL_FOLDER_META:-meta}:/var/lib/garage/meta"
       - "${LOCAL_FOLDER_DATA:-data}:/var/lib/garage/data"
+    healthcheck:
+      test: ["CMD", "/garage", "status"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 10s
 
 networks:
   proxy:

garage.toml.tmpl

@@ -1,6 +1,6 @@
 metadata_dir = "/var/lib/garage/meta"
 data_dir = "/var/lib/garage/data"
-db_engine = "lmdb"
+db_engine = "{{ if env "DATABASE_ENGINE" }}{{ env "DATABASE_ENGINE" }}{{ else }}lmdb{{ end }}"
 metadata_auto_snapshot_interval = "6h"
 
 replication_factor = {{ env "REPLICATION_FACTOR" }}
@@ -15,7 +15,7 @@ compression_level = 2
 rpc_bind_addr = "[::]:3901"
 rpc_public_addr = "{{ env "DOMAIN" }}:3901"
 rpc_addr = "[::]:3901"
-rpc_secret = "{{ secret "rpc_secret" }}"
+rpc_secret_file = "/run/secrets/rpc_secret"
 
 {{ if ne (env "BOOTSTRAP_ID") "" }}
 bootstrap_peers = [
@@ -26,4 +26,4 @@ bootstrap_peers = [
 [s3_api]
 s3_region = "garage"
 api_bind_addr = "[::]:3900"
-root_domain = ".s3.garage"
+root_domain = ".s3.garage"

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}