From 64f8fecdb8066b8cf59973d003bb5ea15ef32189 Mon Sep 17 00:00:00 2001
From: jrhoads <jrhoads@datacite.org>
Date: Fri, 5 Nov 2021 09:54:56 -0400
Subject: [PATCH] Update docker base image.  Include options and instructions
 for local builds with docker compose

---
 Dockerfile               | 6 +++---
 README.md                | 6 ++++++
 docker-compose.local.yml | 5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 docker-compose.local.yml

diff --git a/Dockerfile b/Dockerfile
index 05a5ce34e..8a53479ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM phusion/passenger-full:1.0.9
+FROM phusion/passenger-full:2.0.0
 LABEL maintainer="kgarza@datacite.org"
 
 # Set correct environment variables.
@@ -12,8 +12,8 @@ RUN usermod -a -G docker_env app
 # Use baseimage-docker's init process.
 CMD ["/sbin/my_init"]
 
-# Use Ruby 2.6.5
-RUN bash -lc 'rvm --default use ruby-2.6.5'
+# Use Ruby 2.6.8
+RUN bash -lc 'rvm --default use ruby-2.6.8'
 
 # Update installed APT packages
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
diff --git a/README.md b/README.md
index 7657e4c51..674360c83 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,12 @@ or
 docker-compose up
 ```
 
+If you want to build the docker image locally (instead of pulling it from docker hub)
+ and use docker compose for development you can use
+```bash
+docker-compose -f docker-compose.yml -f docker-compose.local.yml
+```
+
 You can now point your browser to `http://localhost:8065` and use the application. Some API endpoints require authentication.
 
 ## Development
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
new file mode 100644
index 000000000..63fee7481
--- /dev/null
+++ b/docker-compose.local.yml
@@ -0,0 +1,5 @@
+version: "3"
+
+services:
+  web:
+    build: .