capdocker 1.0.45 → 1.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fde484850a7183a33c694c0acc29bda14287c8d
-  data.tar.gz: 50c08ff083aed46b8bdde8d457396460f5cf83cc
+  metadata.gz: fd2e1a3c3283e057acb7d60b362e27e5b6218dc9
+  data.tar.gz: f92fcd6b27ee62b3ddb759793630ed2279a3cab7
 SHA512:
-  metadata.gz: 38fe9abd09d881e575b9ada7cc6fd34da4066e24d13c16c80d6a1af090bc5abbce4d827873aca17aec7c5a4f0d3672b99362fa3d67e3a1bee188247f4dffa355
-  data.tar.gz: 1008c3cc7743c09adf659beb1bc5fbc424479121a59c3e0d6f8177fb1dc473d2fbe0d78a94e4bdb74d63cb35eb40d04c8473763c068d55293b161341ac9f45b8
+  metadata.gz: 4d4d8070c32f5458c2d9dc443d3e4540785ec874740a60c02349865cc4d8d258fb46b9331d7e345c726cb3b2be89589dcde8c35c496ab5a8915968ab66c0a0b8
+  data.tar.gz: 552e29755ad90175d2b5c1c76287aab376caf1a26fd47a0951970e85987e16ca734ba47af80803ab2dd2fc7a061912e3c6ede89a2734f327e6aef0ee487233c6

data/capdocker.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capdocker}
-  s.version = "1.0.45"
+  s.version = "1.0.46"
   s.authors = ["Ross Riley", "One Black Bear"]
   s.email = %q{ross@oneblackbear.com}
   s.date = Time.now

data/lib/docker.rb

@@ -4,7 +4,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
 		desc "build an updated box, restart container"
 	  task :build do
-	    run "docker build -q=true -t oneblackbear/#{application} containers/#{application}/"
+	    run "docker build -t oneblackbear/#{application} containers/#{application}/"
 	    run "docker stop #{application}"
 	    run "docker rm #{application}"
 	    run build_run_command

data/lib/templates/Dockerfile.erb

@@ -28,6 +28,7 @@ RUN apt-get update
 RUN apt-get -y install mariadb-server
 RUN sed -i 's/^innodb_flush_method/#innodb_flush_method/' /etc/mysql/my.cnf
 RUN sed -i "/^datadir*/ s|=.*|=/data/mysql|" /etc/mysql/my.cnf
+RUN chown -R mysql:mysql /data/mysql
 
 # Install nginx
 RUN apt-get -y install nginx
@@ -56,5 +57,5 @@ RUN chown -R www-data:www-data /var/www
 RUN cd /var/www/ && composer install
 
 #And Start
-CMD chown -R mysql:mysql /data/mysql; service mysql start; php5-fpm; nginx -c /etc/nginx/nginx.conf
+CMD service mysql start; php5-fpm; nginx -c /etc/nginx/nginx.conf
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capdocker
 version: !ruby/object:Gem::Version
-  version: 1.0.45
+  version: 1.0.46
 platform: ruby
 authors:
 - Ross Riley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano