diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
| commit | d69fa9e1f40124279ec9d772e5f54d1e11724e2d (patch) | |
| tree | ef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /Dockerfile | |
| parent | c727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff) | |
| parent | 0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f (diff) | |
Merge changes from upstream with the CSS reload fix
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 8cd374481..ef139dcec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,11 @@ EXPOSE 3000 4000 WORKDIR /mastodon RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \ + && echo "@edge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ && apk -U upgrade \ && apk add -t build-dependencies \ build-base \ + icu-dev \ libidn-dev \ libxml2-dev \ libxslt-dev \ @@ -26,7 +28,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit ffmpeg \ file \ git \ - icu-dev \ + icu-libs \ imagemagick@edge \ libidn \ libpq \ @@ -37,7 +39,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit protobuf \ su-exec \ tini \ - && npm install -g npm@3 && npm install -g yarn \ + yarn@edge \ && update-ca-certificates \ && rm -rf /tmp/* /var/cache/apk/* |