Use the same DATABASE_URL var for both Rails and Clojure app

dev/resources/dev.edn

@@ -1,9 +1,4 @@
 {:components
  {:mem-expiring-set #var asciinema.component.mem-expiring-set/mem-expiring-set}
  :config
- {:http
-  {:port 4000}
-  :db
-  {:uri "jdbc:postgresql://localhost:15432/asciinema_development?user=vagrant"}
-  :a2png
-  {:bin-path "a2png/a2png.sh"}}}
+ {:a2png {:bin-path "a2png/a2png.sh"}}}

dev/src/dev.clj

@@ -8,14 +8,19 @@
             [duct.generate :as gen]
             [duct.util.repl :refer [setup test cljs-repl migrate rollback]]
             [duct.util.system :refer [load-system]]
+            [environ.core :refer [env]]
             [reloaded.repl :refer [system init start stop go reset]]
             [asciinema.boundary.file-store :as file-store]
             [asciinema.boundary.asciicast-database :as asciicast-database]
             [asciinema.component.local-file-store :refer [->LocalFileStore]]
             [asciinema.component.s3-file-store :refer [->S3FileStore]]))
 
+(def default-db-uri "jdbc:postgresql://localhost/asciinema_development?user=asciinema")
+
 (defn new-system []
-  (load-system (keep io/resource ["asciinema/system.edn" "dev.edn" "local.edn"])))
+  (let [bindings {'http-port (Integer/parseInt (:port env "4000"))
+                  'db-uri (:database-url env default-db-uri)}]
+    (load-system (keep io/resource ["asciinema/system.edn" "dev.edn" "local.edn"]) bindings)))
 
 (when (io/resource "local.clj")
   (load "local"))

docker/start.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-export DATABASE_URL=jdbc:${DATABASE_URL}
 export S3_ACCESS_KEY=${AWS_ACCESS_KEY_ID}
 export S3_SECRET_KEY=${AWS_SECRET_ACCESS_KEY}
 

src/asciinema/component/db.clj

@@ -3,7 +3,8 @@
             [asciinema.boundary.user-database :refer :all]
             [clojure.java.jdbc :as jdbc]
             [clj-time.coerce :as timec]
-            [duct.component.hikaricp :as hikaricp]))
+            [duct.component.hikaricp :as hikaricp]
+            [clojure.string :as str]))
 
 (extend-protocol jdbc/ISQLValue
   org.joda.time.DateTime
@@ -47,4 +48,12 @@
 
 ;; constructor
 
-(def hikaricp hikaricp/hikaricp)
+(defn- fix-uri [uri]
+  (when uri
+    (if (str/starts-with? uri "jdbc:")
+      uri
+      (str "jdbc:" uri))))
+
+(defn hikaricp [opts]
+  (let [opts (update opts :uri fix-uri)]
+    (hikaricp/hikaricp opts)))