diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-20 16:37:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 16:37:35 -0600 |
| commit | 24b6e4121f656d24adc5676e8a207ded610a7ea7 (patch) | |
| tree | 1c7b908468e12a40a6433f02f86f2cf47fa53cf9 /Dockerfile | |
| parent | b8c6656ce9e498f2e99d6301212bcd12e7f839df (diff) | |
| parent | 3cae3622146d80aef8e43e5790d25f5e2fc9931e (diff) | |
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index d455116da..6d8465ddc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.4.2-alpine3.6 +FROM ruby:2.5.0-alpine3.7 LABEL maintainer="https://github.com/tootsuite/mastodon" \ description="A GNU Social-compatible microblogging server" @@ -40,6 +40,7 @@ RUN apk -U upgrade \ protobuf \ su-exec \ tini \ + tzdata \ && update-ca-certificates \ && mkdir -p /tmp/src /opt \ && wget -O yarn.tar.gz "https://github.com/yarnpkg/yarn/releases/download/v$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ |