Mostly working, webpack not starting...?

pull/1003/head
Rick Carlino 2018-10-01 10:16:46 -05:00
parent ca3d677928
commit 206129739d
8 changed files with 36 additions and 41 deletions

2
.gitignore vendored
View File

@ -29,3 +29,5 @@ tmp
# Ignore master key for decrypting credentials and more.
/config/master.key
config/credentials.yml.enc
docker_volumes
.env

View File

@ -1,10 +0,0 @@
ADMIN_PASSWORD=password123
# POSTGRES_PASSWORD=password123
DATABASE_URL=postgres://farmbot_sql_db_docker/rails_event_store_active_record?pool=5
API_PORT=3000
API_HOST=10.1.10.219
MQTT_HOST=10.1.10.219
OS_UPDATE_SERVER=https://api.github.com/repos/farmbot/farmbot_os/releases/latest
SMTP_HOST=localhost
DEVISE_SECRET=71e7d6e3b46c4a7115561f2e5dc5fa779811d64e5977be7488a9ac7bcfa05e30c2f16d9debc2de3537b58e0904a5d57c886ea88ee48f442fe3f9697a02fd2e44
SECRET_KEY_BASE=71e7d6e3b46c4a7115561f2e5dc5fa779811d64e5977be7488a9ac7bcfa05e30c2f16d9debc2de3537b58e0904a5d57c886ea88ee48f442fe3f9697a02fd2e44

View File

@ -1,8 +0,0 @@
FROM ruby:2.5.1
RUN apt-get update && apt-get install -y build-essential nodejs imagemagick
RUN mkdir -p /farmbot_api
WORKDIR /farmbot_api
COPY . /farmbot_api
RUN gem install bundler && bundle install --jobs 20 --retry 5
EXPOSE 3000
CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]

View File

@ -1,15 +0,0 @@
version: '3'
services:
farmbot_sql_db_docker:
image: postgres
web-app:
restart: on-failure
build:
context: ..
dockerfile: compose/api.Dockerfile
ports:
- 3000:3000
volumes:
- ./docker_data:/farmbot_api
depends_on:
- farmbot_sql_db_docker

View File

@ -1,4 +0,0 @@
FROM postgres:9.4
# Use "postgres" database
ENV POSTGRES_PASSWORD password123

View File

@ -12,7 +12,3 @@ Devise.setup do |config|
config.reset_password_within = 6.hours
config.sign_out_via = [:delete, :get]
end
puts "="*40
puts "="*40
puts "="*40
puts "="*40

View File

@ -0,0 +1,12 @@
FROM ruby:2.5
RUN apt-get update -qq && apt-get install -y \
build-essential \
libpq-dev \
nodejs \
postgresql \
postgresql-contrib
RUN mkdir /farmbot
WORKDIR /farmbot
COPY . /farmbot
RUN bundle install

22
docker-compose.yml 100644
View File

@ -0,0 +1,22 @@
version: '3'
services:
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
volumes:
- .:/farmbot
ports:
- "3000:3000"
depends_on:
- db
env_file:
- ./.env