diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-19 18:28:37 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-19 18:28:37 +0100 |
| commit | 5e0cf92fd145b27053389e5ffcce48da77439713 (patch) | |
| tree | 27e1567b240f1a3117de595413ccceb9222d8465 /Dockerfile | |
| parent | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (diff) | |
| parent | 7c3fddeab4c4ddebca7d5441ac67870aa1cecfe4 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
No conflicts.
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 28cb5260e..aefcb44bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM node:8.14.0-alpine as node -FROM ruby:2.4.5-alpine3.8 +FROM node:8.15-alpine as node +FROM ruby:2.6-alpine3.8 LABEL maintainer="https://github.com/tootsuite/mastodon" \ description="Your self-hosted, globally interconnected microblogging community" |