diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-06 21:35:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 21:35:10 +0200 |
| commit | cd77c75d6cca50b8ec9d0ae31bd1249ae6b64ef9 (patch) | |
| tree | 044a3563536b3e4c2367468af0d1309f39a4cec4 | |
| parent | fa494dbb1d51dad926dd9b95e333dce48c2a3891 (diff) | |
| parent | ed2bfdee67735a32defda60036d5c01dfb71e417 (diff) | |
Merge pull request #1088 from Wonderfall/master
Add metadata to Dockerfile
| -rw-r--r-- | Dockerfile | 5 | ||||
| -rw-r--r-- | README.md | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile index f5eb08893..c28287cca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/ diff --git a/README.md b/README.md index db60b66f7..9b43e8077 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,8 @@ Consult the example configuration file, `.env.production.sample` for the full li ## Running with Docker and Docker-Compose +[](https://microbadger.com/images/gargron/mastodon "Get your own version badge on microbadger.com") [](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 |