Merge pull request #8 from ralatsdc/rl/upstream-use-common-environmen…

…t-variable-names Use common environment variable names
IQTLabs · Feb 22, 2024 · b153eb5 · b153eb5
2 parents 00be742 + a204d1c
commit b153eb5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/example.env → couchdb-startup.env b/example.env → couchdb-startup.env
@@ -6,4 +6,4 @@ DEVICE_IP=<DEVICE_IP>
 # Set this value to true if running the docker install for a mobile device. 
 # Set it to false when running it for a CouchDB sync server
 
-PERIPHERAL=true
+PERIPHERAL=true
diff --git a/couchdb-startup/couchdbinit.sh b/couchdb-startup/couchdbinit.sh
@@ -4,6 +4,7 @@
 while [ "$(curl -s -o /dev/null -w ''%{http_code}'' couchdb-server:5984)" != "200" ]; do sleep 5; done
 
 # Create system tables and table "aisonobuoy" which is used for synching all data from devices
+# TODO: Do not hardcode CouchDB server IP?
 curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-server:5984/_users
 curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-server:5984/_replicator
 curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-server:5984/_global_changes

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,12 +20,13 @@ services:
       context: ./couchdb-startup
       dockerfile: ./Dockerfile
     restart: "unless-stopped"
-    env_file:
-      - .env
-    depends_on:
-      - couchdb-server
     logging:
       driver: "json-file"
       options:
         max-size: "10M"
-        max-file: "10"
+        max-file: "10"
+    depends_on:
+      - couchdb-server
+    env_file:
+      - path: ./couchdb-startup.env
+        required: false