From b2e3d99f8275949c04f4127e21b45b7491d2d2df Mon Sep 17 00:00:00 2001 From: Wonderfall Date: Thu, 6 Apr 2017 20:57:16 +0200 Subject: [PATCH 1/2] add metadata to Dockerfile --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index f5eb088933..c28287cca8 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/ From 9e2f235405ae39c169412c1b0077da451e87fcb2 Mon Sep 17 00:00:00 2001 From: Wonderfall Date: Thu, 6 Apr 2017 20:59:20 +0200 Subject: [PATCH 2/2] add Docker microbadger to README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index db60b66f7e..9b43e80773 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://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