diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-09-28 11:51:36 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-28 04:51:36 +0200 |
| commit | b9f59ebcc68e9da0a7158741a1a2ef3564e1321e (patch) | |
| tree | 5b4805de23acf2cb308a72f1a7926d50352498d0 /Dockerfile | |
| parent | e648ef0bfbb9c57b508fa918398066ceb14856ea (diff) | |
Update Yarn to version 1.1.0 (#5125)
* Update Yarn to version 1.1.0
* remove hard-coding
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index 3ad2ad7efe9..431ef5bbeb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,8 @@ ENV UID=991 GID=991 \ RAILS_SERVE_STATIC_FILES=true \ RAILS_ENV=production NODE_ENV=production +ARG YARN_VERSION=1.1.0 +ARG YARN_DOWNLOAD_SHA256=171c1f9ee93c488c0d774ac6e9c72649047c3f896277d88d0f805266519430f3 ARG LIBICONV_VERSION=1.15 ARG LIBICONV_DOWNLOAD_SHA256=ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 @@ -19,6 +21,7 @@ RUN apk -U upgrade \ build-base \ icu-dev \ libidn-dev \ + libressl \ libtool \ postgresql-dev \ protobuf-dev \ @@ -32,16 +35,21 @@ RUN apk -U upgrade \ imagemagick \ libidn \ libpq \ - nodejs-npm \ nodejs \ + nodejs-npm \ protobuf \ su-exec \ tini \ - yarn \ && 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" \ + && echo "$YARN_DOWNLOAD_SHA256 *yarn.tar.gz" | sha256sum -c - \ + && tar -xzf yarn.tar.gz -C /tmp/src \ + && rm yarn.tar.gz \ + && mv /tmp/src/yarn-v$YARN_VERSION /opt/yarn \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && 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 - \ - && mkdir -p /tmp/src \ && tar -xzf libiconv.tar.gz -C /tmp/src \ && rm libiconv.tar.gz \ && cd /tmp/src/libiconv-$LIBICONV_VERSION \ @@ -56,7 +64,7 @@ COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/ RUN bundle config build.nokogiri --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \ && bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without test development \ - && yarn --ignore-optional --pure-lockfile + && yarn --pure-lockfile COPY . /mastodon |