From 407073d7a2557bb0da42472b822c664863bcc7fc Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Tue, 18 Jul 2017 22:19:49 +0900 Subject: Move icu-dev to build-dependencies (#4240) --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 8cd374481..760999f8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit && apk -U upgrade \ && apk add -t build-dependencies \ build-base \ + icu-dev \ libidn-dev \ libxml2-dev \ libxslt-dev \ @@ -26,7 +27,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 \ -- cgit From c0c7af2194cffcddbbcab5879f37afca3eb0bcec Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Tue, 18 Jul 2017 22:21:30 +0900 Subject: Download npm and yarn from Alpine packages repository (#4242) --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 760999f8c..ef139dcec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ 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 \ @@ -38,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/* -- cgit