Switch `webpack` service to Alpine
parent
72c4df8ebb
commit
1ac4cde3f7
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 .",
|
||||
|
|
Loading…
Reference in New Issue