diff options
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | package.json | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index c22756d0c..377380a84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,6 @@ RUN apk -U upgrade \ libidn \ libpq \ nodejs \ - nodejs-npm \ protobuf \ su-exec \ tini \ diff --git a/docker-compose.yml b/docker-compose.yml index 55b419e98..4d9a6c40d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,7 +55,7 @@ services: image: gargron/mastodon restart: always env_file: .env.production - command: npm run start + command: yarn start networks: - external_network - internal_network diff --git a/package.json b/package.json index abc13e1ea..5b9ea7d37 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,9 @@ "build:production": "cross-env RAILS_ENV=production ./bin/webpack", "manage:translations": "node ./config/webpack/translationRunner.js", "start": "node ./streaming/index.js", - "test": "npm run test:lint && npm run test:jest", + "test": "yarn run test:lint && yarn run test:jest", "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ streaming/", - "test:jest": "cross-env NODE_ENV=test jest --coverage", - "postinstall": "npm rebuild node-sass" + "test:jest": "cross-env NODE_ENV=test jest --coverage" }, "repository": { "type": "git", |