diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2018-03-10 19:49:04 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-10 11:49:04 +0100 |
| commit | 36579bac88b88b7bb916ce7bcc56152427156a26 (patch) | |
| tree | d151c59515813d161e405280bd5d0f022e70927a | |
| parent | 4476a454445281b2468d03c9c6d4d99e52b1a597 (diff) | |
Use Alpine Linux yarn package in Docker (#6725)
Yarn was manually installed to meet the Yarn version requirement of webpacker. Today, Alpine Linux 3.7 provides Yarn new enough.
| -rw-r--r-- | Dockerfile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile index f6fd6c3cb..9eb5e609d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,6 @@ ARG GID=991 ENV RAILS_SERVE_STATIC_FILES=true \ RAILS_ENV=production NODE_ENV=production -ARG YARN_VERSION=1.5.1 -ARG YARN_DOWNLOAD_SHA256=cd31657232cf48d57fdbff55f38bfa058d2fb4950450bd34af72dac796af4de1 ARG LIBICONV_VERSION=1.15 ARG LIBICONV_DOWNLOAD_SHA256=ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 @@ -40,14 +38,9 @@ RUN apk -U upgrade \ protobuf \ tini \ tzdata \ + 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 \ + && mkdir -p /tmp/src \ && wget -O libiconv.tar.gz "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$LIBICONV_VERSION.tar.gz" \ && echo "$LIBICONV_DOWNLOAD_SHA256 *libiconv.tar.gz" | sha256sum -c - \ && tar -xzf libiconv.tar.gz -C /tmp/src \ |