commit: cd77c75d6cca50b8ec9d0ae31bd1249ae6b64ef9
parent: fa494dbb1d51dad926dd9b95e333dce48c2a3891
Author: Eugen <eugen@zeonfederated.com>
Date: Thu, 6 Apr 2017 21:35:10 +0200
Merge pull request #1088 from Wonderfall/master
Add metadata to Dockerfile
Diffstat:
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git 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
@@ -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