diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-11 09:17:21 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-11 09:17:21 +0000 |
| commit | a0724cd7426dec36b7966c86a1708f62e6e5fd4c (patch) | |
| tree | 4dda4d9148ceaca5634f7860d3c4c2aa2e6f95e7 /Dockerfile | |
| parent | 0c2a16fcbfeb01df3e37f158937f50f0d1480370 (diff) | |
| parent | b6003afcdb1b89eb967a2b211e3b4e26aed9ac9d (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Dockerfile b/Dockerfile index 73051cd4b..02c32359e 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 @@ -32,24 +30,17 @@ RUN apk -U upgrade \ ca-certificates \ ffmpeg \ file \ - git \ icu-libs \ imagemagick \ libidn \ libpq \ nodejs \ protobuf \ - su-exec \ 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 \ |