Skip to content

Commit

Permalink
Update docker base image. Include options and instructions for local …
Browse files Browse the repository at this point in the history
…builds with docker compose
  • Loading branch information
jrhoads committed Nov 5, 2021
1 parent 6d72426 commit 64f8fec
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-full:1.0.9
FROM phusion/passenger-full:2.0.0
LABEL maintainer="[email protected]"

# Set correct environment variables.
Expand All @@ -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" && \
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions docker-compose.local.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: "3"

services:
web:
build: .

0 comments on commit 64f8fec

Please sign in to comment.