Merge pull request #50 from bheesham/minor-settings-fixups

Minor settings fixups

Author: bheesham

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dino-park-packs"
-version = "0.5.13"
+version = "0.5.14"
 authors = ["Florian Merz <flomerz@gmail.com>"]
 edition = "2018"
 

Dockerfile

@@ -9,6 +9,7 @@ FROM debian:13-slim
 RUN apt-get update && apt-get install -y \
     libpq5 ca-certificates \
  && rm -rf /var/lib/apt/lists/*
+
 WORKDIR /root/
 COPY --from=0 /usr/src/app/target/release/dino-park-packs .
 CMD ["./dino-park-packs"]

dev/docker-compose.yml

@@ -9,13 +9,20 @@ services:
       POSTGRES_DB: dino-park-packs-test-local
       POSTGRES_PASSWORD: localhost
 
+  adminer:
+    image: adminer:5-standalone
+    ports:
+    - 127.0.0.1:9000:8080
+    environment:
+      ADMINER_DEFAULT_SERVER: postgres
+
   packs:
     image: dino-park-packs:development
     build:
       context: ../
       dockerfile: Dockerfile.local
     environment:
-      DPP_SETTINGS: /root/.settings
+      DPP_SETTINGS: /root/.settings.json
     volumes:
     - ../dev/settings.json:/root/.settings.json
     ports:

dev/settings.json

@@ -1,5 +1,13 @@
 {
-  "auth": "https://dev.mozilla-dev.auth0.com",
+  "comment": [
+    "DEBT: The config parser expects all keys to be defined. It does not use",
+    "the fallback to using the default values on `None`. This comment section",
+    "is also a hack.",
+    "See also:",
+    "* src/settings.rs;",
+    "* the `config` dependency."
+  ],
+  "auth": "https://dev.mozilla-dev.auth0.com/",
   "cis": {
     "client_config": {
       "client_id": "",

src/settings.rs

@@ -30,7 +30,7 @@ impl Settings {
         let file = env::var("DPP_SETTINGS").unwrap_or_else(|_| String::from(".settings"));
         Config::builder()
             .add_source(File::with_name(&file))
-            .add_source(Environment::default().separator("__").prefix("dp"))
+            .add_source(Environment::with_prefix("DP").separator("__"))
             .build()
             .and_then(Config::try_deserialize::<Settings>)
     }