From 1e1d7887577ce5e2b1ceb0c1d08578ca173d5f5f Mon Sep 17 00:00:00 2001 From: Hinaloe Date: Sun, 1 Oct 2017 05:05:24 +0900 Subject: [PATCH] Reduce container size with clean yarn (#3506) * Reduce container size with clean yarn * Merge trouble --- .yarnclean | 46 ++++++++++++++++++++++++++++++++++++++++++++++ Dockerfile | 5 +++-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 .yarnclean diff --git a/.yarnclean b/.yarnclean new file mode 100644 index 000000000..f2de52869 --- /dev/null +++ b/.yarnclean @@ -0,0 +1,46 @@ +# test directories +__tests__ +test +tests +powered-test + +# asset directories +docs +doc +website +images +# assets + +# examples +example +examples + +# code coverage directories +coverage +.nyc_output + +# build scripts +Makefile +Gulpfile.js +Gruntfile.js + +# configs +.tern-project +.gitattributes +.editorconfig +.*ignore +.eslintrc +.jshintrc +.flowconfig +.documentup.json +.yarn-metadata.json +.*.yml +*.yml + +# misc +*.gz +*.md + +# for specific ignore +!.svgo.yml + diff --git a/Dockerfile b/Dockerfile index 431ef5bbe..c3b38fa8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,11 +60,12 @@ RUN apk -U upgrade \ && cd /mastodon \ && rm -rf /tmp/* /var/cache/apk/* -COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/ +COPY Gemfile Gemfile.lock package.json yarn.lock .yarnclean /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 --pure-lockfile + && yarn --pure-lockfile \ + && yarn cache clean COPY . /mastodon