Merge branch 'master' into main

Gemfile.lock

@@ -269,6 +269,15 @@ GEM
     rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
     rspec-expectations (3.12.3)
+    rdoc (6.3.2)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-github (2.4.0)

Makefile

@@ -0,0 +1,8 @@
+GCLOUD_PROJECT:=$(shell gcloud config list project --format="value(core.project)")
+PROJECT_NAME:=klaxon
+
+build:
+	docker build -t us.gcr.io/$(GCLOUD_PROJECT)/$(PROJECT_NAME) .
+
+push: build
+	docker push us.gcr.io/$(GCLOUD_PROJECT)/$(PROJECT_NAME)

config/database.yml

@@ -17,4 +17,8 @@ test:
 
 production:
   <<: *default
-  url: <%= ENV['DATABASE_URL'] %>
+  database: <%= ENV.fetch('DB_NAME') %>
+  username: <%= ENV.fetch('DB_USER') %>
+  password: <%= ENV.fetch('DB_PASSWORD') %>
+  host: <%= ENV.fetch('DB_HOST', 'localhost') %>
+  port: 5432

entrypoint.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Precompile files
+bundle exec rake assets:precompile
+
+# Run the server
+bundle exec puma -C config/puma.rb