fix(docker): fix docker compose file for litestream

ar-io · May 23, 2024 · 82c22df · 82c22df
1 parent 223fdde
commit 82c22df
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/.env.litestream.sample b/.env.litestream.sample
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -27,15 +27,16 @@ services:
 
   litestream:
     profiles: ['litestream']
-    build: 
+    build:
       context: litestream
     environment:
-      TVAL_LOCAL_DB_PATH: ${LOCAL_DB_PATH:-/app/data/sqlite}
-      TVAL_S3_BUCKET_PATH: ${S3_BUCKET_PATH:-}
-      TVAL_AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-}
-      TVAL_AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-}
-      WAIT_TIME_SECONDS: ${WAIT_TIME_SECONDS:-}
-      RESTORE_FROM_BACKUP: ${RESTORE_FROM_BACKUP:-false}
+      TVAL_LOCAL_DB_PATH: ${LITESTREAM_LOCAL_DB_PATH:-/app/data/sqlite}
+      TVAL_S3_BUCKET_PATH: ${LITESTREAM_S3_BUCKET_PATH:-}
+      TVAL_S3_BUCKET: ${LITESTREAM_S3_BUCKET:-}
+      TVAL_AWS_ACCESS_KEY_ID: ${LITESTREAM_AWS_ACCESS_KEY_ID:-}
+      TVAL_AWS_SECRET_ACCESS_KEY: ${LITESTREAM_AWS_SECRET_ACCESS_KEY:-}
+      WAIT_TIME_SECONDS: ${LITESTREAM_WAIT_TIME_SECONDS:-}
+      RESTORE_FROM_BACKUP: ${LITESTREAM_RESTORE_FROM_BACKUP:-false}
     volumes:
       - ${WARP_SQLITE_CACHE_PATH:-./cache/warp/sqlite}:/app/data/sqlite
 

diff --git a/litestream/.env.sample b/litestream/.env.sample
@@ -1,6 +1,7 @@
 TVAL_LOCAL_DB_PATH=/cache/warp/sqlite
 TVAL_AWS_ACCESS_KEY_ID=
 TVAL_AWS_SECRET_ACCESS_KEY=
-TVAL_S3_BUCKET_PATH=s3://<bucket-name>/<sqlite-path>/
+TVAL_S3_BUCKET_PATH=/<sqlite-path-in-s3/
+TVAL_S3_BUCKET=
 WAIT_TIME_SECONDS=0
 RESTORE_FROM_BACKUP=false
diff --git a/litestream/litestream.template.yaml b/litestream/litestream.template.yaml
@@ -8,7 +8,11 @@ secret-access-key: #@ data.values.AWS_SECRET_ACCESS_KEY
 dbs:
   - path: #@ data.values.LOCAL_DB_PATH + "/state.db"
     replicas:
-      - url: #@ data.values.S3_BUCKET_PATH
+      - type: s3
+        bucket: #@ data.values.S3_BUCKET
+        path: #@ data.values.S3_BUCKET_PATH
   - path: #@ data.values.LOCAL_DB_PATH + "/contract.db"
     replicas:
-      - url: #@ data.values.S3_BUCKET_PATH
+      - type: s3
+        bucket: #@ data.values.S3_BUCKET
+        path: #@ data.values.S3_BUCKET_PATH
diff --git a/src/system.ts b/src/system.ts
@@ -19,10 +19,7 @@ import { getContractState } from './api/warp';
 import { prefetchContractTxIds } from './config';
 import logger from './logger';
 import { warp } from './middleware';
-import {
-  PREFETCH_CONTRACTS,
-} from './constants';
-
+import { PREFETCH_CONTRACTS } from './constants';
 
 export const bootstrapCache = async () => {
   if (PREFETCH_CONTRACTS) {