Merge 08739cf into 8617ad2

Dockerfile

@@ -1,7 +1,7 @@
 # Dockerfile # Plots2
 # https://github.com/publiclab/plots2
 
-FROM ruby:2.3
+FROM ruby:2.3-jessie
 
 LABEL maintainer="Sebastian Silva <sebastian@fuentelibre.org>"
 LABEL description="This image deploys Plots2."

Makefile

@@ -1,3 +1,21 @@
+build:
+	cp config/database.yml.example config/database.yml
+	cp db/schema.rb.example db/schema.rb
+	docker-compose down --remove-orphans
+	docker-compose build
+
+deploy-container:
+	docker-compose run web sleep 5
+	docker-compose run web rake db:migrate
+	docker-compose run web bower install --allow-root
+	docker-compose run web bower update --allow-root
+	docker-compose run web rake assets:precompile
+	test -e tmp/pids/server.pid && rm tmp/pids/server.pid
+	docker-compose up -d
+	docker-compose exec -T web bash -c "echo 172.19.0.1 smtp >> /etc/hosts"	
+	docker-compose exec -T web bundle exec whenever --update-crontab
+	docker-compose exec -T web service start cron
+
 install-dev:
 	echo "Installing RubyGems"
 	bundle install --without production mysql

containers/docker-compose-production.yml

@@ -0,0 +1,32 @@
+version: "2"
+services:
+  db:
+    ports:
+      - "127.0.0.1:3307:3306"
+    image: mariadb:10.2
+    restart: unless-stopped
+    environment:
+      - MYSQL_DATABASE=plots_$RAILS_ENV
+      - MYSQL_USER=plots
+      - MYSQL_PASSWORD=plots
+      - MYSQL_RANDOM_ROOT_PASSWORD=true
+    volumes:
+      - ./config/my.cnf:/etc/mysql/my.cnf
+      # for configuration 
+      - ../mysql:/var/lib/mysql
+      # for persistence
+      - ../dump:/docker-entrypoint-initdb.d
+      # for importing a dump
+      # if you want to re-import simply put away ../mysql/*
+#  web:
+#    build: .
+#    command: /bin/bash -c "sleep 5 && bundle exec rails s -p 4000 -b '0.0.0.0'"
+#    environment:
+#      - RAILS_ENV=${RAILS_ENV}
+#    volumes:
+#      - .:/app
+#    ports:
+#      - "127.0.0.1:4001:4000"
+#    links:
+#      - db
+#    restart: unless-stopped

containers/docker-compose-stable.yml

@@ -0,0 +1,30 @@
+version: "2"
+services:
+  db:
+    image: mariadb:10.2
+    environment:
+      - MYSQL_DATABASE=plots
+      - MYSQL_USER=plots
+      - MYSQL_PASSWORD=plots
+      - MYSQL_RANDOM_ROOT_PASSWORD=true
+    volumes:
+      - ../mysql:/var/lib/mysql
+      # for persistence
+      - ../dump:/docker-entrypoint-initdb.d
+      # for importing a dump
+      # if you want to re-import simply put away ../mysql/*
+  web:
+    build: .
+    command: /bin/bash -c "sleep 5 && passenger start -p 4000"
+    environment:
+      - RAILS_ENV=${RAILS_ENV}
+      - SOLR_URL=${SOLR_URL}
+      - SECRET_KEY_BASE=${SECRET_KEY_BASE}
+      - DISABLE_SOLR_CHECK=1
+    volumes:
+      - .:/app
+    ports:
+      - "127.0.0.1:4000:4000"
+    links:
+      - db
+#    restart: unless-stopped

containers/docker-compose-unstable.yml

@@ -0,0 +1,30 @@
+version: "2"
+services:
+  db:
+    image: mariadb:10.2
+    environment:
+      - MYSQL_DATABASE=plots
+      - MYSQL_USER=plots
+      - MYSQL_PASSWORD=plots
+      - MYSQL_RANDOM_ROOT_PASSWORD=true
+    volumes:
+      - ./config/my.cnf:/etc/mysql/my.cnf
+      # for configuration 
+      - ../mysql:/var/lib/mysql
+      # for persistence
+      - ../dump:/docker-entrypoint-initdb.d
+      # for importing a dump
+      # if you want to re-import simply put away ../mysql/*
+  web:
+    build: .
+    command: /bin/bash -c "sleep 5 && passenger start -p 5001"
+    environment:
+      - RAILS_ENV=${RAILS_ENV}
+      - SECRET_KEY_BASE=${SECRET_KEY_BASE}
+    volumes:
+      - .:/app
+    ports: 
+      - "127.0.0.1:5001:5001"
+    links:
+      - db
+#    restart: unless-stopped