🎉

pull/1003/head
Rick Carlino 2018-10-01 14:29:47 -05:00
parent 958ad309f8
commit 139e5e41a9
4 changed files with 71 additions and 19 deletions

View File

@ -1,5 +1 @@
rails: rails s -e development -p ${API_PORT:-3000} -b 0.0.0.0
rabbit_workers: bin/rails r lib/rabbit_workers.rb
webpack: ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js
worker: rake jobs:work
log_digests: FOREVER=true rake api:log_digest

View File

@ -19,6 +19,10 @@ module FarmBot
I18n.enforce_available_locales = false
LOCAL_API_HOST = ENV["API_HOST"] || "localhost"
WEBPACK_URL = "http://#{LOCAL_API_HOST}:3808"
config.webpack.dev_server.host = proc { request.host }
config.webpack.dev_server.manifest_host = "webpack"
config.webpack.dev_server.manifest_port = 3808
10.times do puts "==HELLO??"*10 end
config.generators do |g|
g.template_engine :erb
g.test_framework :rspec, :fixture_replacement => :factory_bot, :views => false, :helper => false

View File

@ -6,8 +6,9 @@ RUN apt-get update -qq && apt-get install -y \
postgresql-contrib
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
RUN apt-get install -y nodejs
RUN mkdir /farmbot
RUN mkdir /farmbot
WORKDIR /farmbot
COPY . /farmbot
ENV BUNDLE_PATH=/bundle BUNDLE_BIN=/bundle/bin GEM_HOME=/bundle
ENV PATH="${BUNDLE_BIN}:${PATH}"
COPY ./Gemfile /farmbot
RUN bundle install

View File

@ -1,12 +1,6 @@
version: '3'
services:
db:
image: postgres
volumes:
- ./docker_volumes/db:/var/lib/postgresql/data
env_file:
- ./.env
mqtt:
mqtt: # ======================================================================
build: ./mqtt
ports:
- "5672:5672" # AMQP (RabbitMQ)
@ -14,18 +8,75 @@ services:
- "8883:8883" # MQTT over TLS/SSL
- "3002:15675" # MQTT over WebSockets
- "15672:15672" # Management API
web:
db: # =======================================================================
image: postgres
volumes:
- ././docker_volumes/db:/var/lib/postgresql/data
env_file:
- .env
web: # ======================================================================
build:
context: .
dockerfile: docker-api.Dockerfile
# command: bundle exec rails s -p 3000 -b '0.0.0.0'
command: bundle exec rails api:start
# Add the `rm -f` part to avoid "server is still running..." errors:
command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
volumes:
- .:/farmbot
- ./docker_volumes/bundle_cache:/bundle
ports:
- "3000:3000" # Web / API
- "3808:3808" # Webpack Dev Server
depends_on:
- db
env_file:
- ./.env
- .env
webpack: # ===================================================================
build:
context: .
dockerfile: docker-api.Dockerfile
command: ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js
volumes:
- .:/farmbot
- ./docker_volumes/bundle_cache:/bundle
ports:
- "3808:3808" # Webpack Dev Server
depends_on:
- web
env_file:
- .env
delayed_job: # ===============================================================
build:
context: .
dockerfile: docker-api.Dockerfile
command: rake jobs:work
volumes:
- .:/farmbot
- ./docker_volumes/bundle_cache:/bundle
env_file:
- .env
depends_on:
- db
log_digests: # ===============================================================
build:
context: .
dockerfile: docker-api.Dockerfile
command: rake api:log_digest
volumes:
- .:/farmbot
- ./docker_volumes/bundle_cache:/bundle
depends_on:
- db
env_file:
- .env
rabbit_jobs: # ===============================================================
build:
context: .
dockerfile: docker-api.Dockerfile
command: rails r lib/rabbit_workers.rb
volumes:
- .:/farmbot
- ./docker_volumes/bundle_cache:/bundle
depends_on:
- db
- mqtt
env_file:
- .env