Skip to content

Commit

Permalink
Merge pull request mastodon#1088 from Wonderfall/master
Browse files Browse the repository at this point in the history
Add metadata to Dockerfile
  • Loading branch information
Gargron authored Apr 6, 2017
2 parents fa494db + ed2bfde commit cd77c75
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
FROM ruby:2.3.1-alpine

LABEL maintainer="https://github.com/tootsuite/mastodon" \
description="A GNU Social-compatible microblogging server"

ENV RAILS_ENV=production \
NODE_ENV=production

EXPOSE 3000 4000

WORKDIR /mastodon

COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ Consult the example configuration file, `.env.production.sample` for the full li

## Running with Docker and Docker-Compose

[![](https://images.microbadger.com/badges/version/gargron/mastodon.svg)](https://microbadger.com/images/gargron/mastodon "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/gargron/mastodon.svg)](https://microbadger.com/images/gargron/mastodon "Get your own image badge on microbadger.com")

The project now includes a `Dockerfile` and a `docker-compose.yml`. You need to turn `.env.production.sample` into `.env.production` with all the variables set before you can:

docker-compose build
Expand Down

0 comments on commit cd77c75

Please sign in to comment.