From 1ac4cde3f7c5069d60780473f938135201f16e6b Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 8 Oct 2018 11:08:20 -0500 Subject: [PATCH] Switch `webpack` service to Alpine --- .travis.yml | 1 - docker-compose.yml | 8 +++++--- package.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f36bdedec..2bf4ed558 100755 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ before_script: - sudo docker-compose run web npm install - sudo docker-compose run web bundle exec rails db:setup - sudo docker-compose run web rake keys:generate - # - sudo docker-compose run web npm run build script: - sudo docker-compose run web npm run tslint - sudo docker-compose run web npm run sass-lint diff --git a/docker-compose.yml b/docker-compose.yml index f8feb9ed6..5f372998a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,7 @@ x-rails: &rails x-base_config: &base_config env_file: .env - restart: unless-stopped - + # restart: unless-stopped services: redis: <<: *base_config @@ -52,8 +51,11 @@ services: - ./docker_volumes/rabbit:/farmbot webpack: # ==================== <<: *base_config - <<: *rails + image: node:8.12.0-alpine + working_dir: /farmbot command: ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js + volumes: + - .:/farmbot ports: ["3808:3808"] # Webpack Dev Server delayed_job: # ==================== <<: *base_config diff --git a/package.json b/package.json index 08dc4d24a..bf937b248 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "start": "echo 'use `sudo docker-compose up` instead.'", "heroku-postbuild": "webpack --config=./config/webpack.prod.js", "webpack": "./node_modules/.bin/webpack-dev-server --config config/webpack.dev.js", - "test-slow": "jest --coverage --no-cache --maxWorkers=4 --ci", + "test-slow": "jest --coverage --ci", "test": "jest --no-coverage --cache -w 5", "typecheck": "./node_modules/.bin/tsc --noEmit --jsx preserve", "tslint": "./node_modules/tslint/bin/tslint --project .",