diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-05 19:01:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 19:01:44 +0200 |
| commit | 515ce8f4697fe7edfdf14c45575a71164b920db9 (patch) | |
| tree | 1211e136ba3e886ee8daaa5200babffc42375dd1 /Dockerfile | |
| parent | a9e8f98a9d32c57956d41009bd09a1f33310676e (diff) | |
| parent | 00fcdebed758f031b486ec239fd425fc54a180b3 (diff) | |
Merge pull request #762 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 503696cf6..bdc10c4ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM node:8.11.3-alpine as node -FROM ruby:2.4.4-alpine3.6 +FROM node:8.12.0-alpine as node +FROM ruby:2.4.4-alpine3.7 LABEL maintainer="https://github.com/tootsuite/mastodon" \ description="Your self-hosted, globally interconnected microblogging community" |