Update to Alpine 3.6 (#4747)

This commit is contained in:
Wonderfall 2017-08-30 23:52:19 +02:00 committed by Eugen Rochko
parent fec13735a7
commit cecf204bbb
1 changed files with 6 additions and 8 deletions

View File

@ -1,4 +1,4 @@
FROM ruby:2.4.1-alpine FROM ruby:2.4.1-alpine3.6
LABEL maintainer="https://github.com/tootsuite/mastodon" \ LABEL maintainer="https://github.com/tootsuite/mastodon" \
description="A GNU Social-compatible microblogging server" description="A GNU Social-compatible microblogging server"
@ -14,9 +14,7 @@ EXPOSE 3000 4000
WORKDIR /mastodon WORKDIR /mastodon
RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \ RUN apk -U upgrade \
&& echo "@edge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
&& apk -U upgrade \
&& apk add -t build-dependencies \ && apk add -t build-dependencies \
build-base \ build-base \
icu-dev \ icu-dev \
@ -31,15 +29,15 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
file \ file \
git \ git \
icu-libs \ icu-libs \
imagemagick@edge \ imagemagick \
libidn \ libidn \
libpq \ libpq \
nodejs-npm@edge \ nodejs-npm \
nodejs@edge \ nodejs \
protobuf \ protobuf \
su-exec \ su-exec \
tini \ tini \
yarn@edge \ yarn \
&& update-ca-certificates \ && update-ca-certificates \
&& wget -O libiconv.tar.gz "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$LIBICONV_VERSION.tar.gz" \ && wget -O libiconv.tar.gz "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$LIBICONV_VERSION.tar.gz" \
&& echo "$LIBICONV_DOWNLOAD_SHA256 *libiconv.tar.gz" | sha256sum -c - \ && echo "$LIBICONV_DOWNLOAD_SHA256 *libiconv.tar.gz" | sha256sum -c - \