From 9f7a969dc88cea8fbed190cbd91865a6ea39ad3a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 24 Apr 2023 11:33:34 +0100 Subject: [PATCH] DEV: Install all yarn dependencies (#708) `devDependencies` is often used for things like ember-cli build tooling. Until now we have been moving those things to `dependencies` in our `package.json`, but it makes more sense for us to conform to the industry norms. --- image/base/release.Dockerfile | 2 +- image/base/slim.Dockerfile | 3 ++- templates/web.template.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/image/base/release.Dockerfile b/image/base/release.Dockerfile index 9450259..b5f4822 100644 --- a/image/base/release.Dockerfile +++ b/image/base/release.Dockerfile @@ -8,7 +8,7 @@ RUN cd /var/www/discourse &&\ sudo -u discourse bundle config --local path ./vendor/bundle &&\ sudo -u discourse bundle config --local without test development &&\ sudo -u discourse bundle install --jobs 4 &&\ - sudo -u discourse yarn install --production --frozen-lockfile &&\ + sudo -u discourse yarn install --frozen-lockfile &&\ sudo -u discourse yarn cache clean &&\ bundle exec rake maxminddb:get &&\ find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} + diff --git a/image/base/slim.Dockerfile b/image/base/slim.Dockerfile index a6edea2..dbc9cdd 100644 --- a/image/base/slim.Dockerfile +++ b/image/base/slim.Dockerfile @@ -7,7 +7,8 @@ ENV PG_MAJOR=13 \ RAILS_ENV=production \ RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH + PATH=/usr/local/cargo/bin:$PATH \ + LEFTHOOK=0 #LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\"" diff --git a/templates/web.template.yml b/templates/web.template.yml index 10b006e..e37d0d9 100644 --- a/templates/web.template.yml +++ b/templates/web.template.yml @@ -172,7 +172,7 @@ run: - exec: cd: $home cmd: - - su discourse -c 'yarn install --production --frozen-lockfile && yarn cache clean' + - su discourse -c 'yarn install --frozen-lockfile && yarn cache clean' - exec: cd: $home -- 2.25.1