capdocker 1.0.52 → 1.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c93fac7cedb26046955cb5d7816f0094be28efe
-  data.tar.gz: b6eb9efb6d245b6793f15b1b66222e1ca0707cfd
+  metadata.gz: 5ad835aa251fac56310c83b81aaf2df9b045244f
+  data.tar.gz: d3d0e5010d2b8f031b90995b52a81c3949582cb8
 SHA512:
-  metadata.gz: d51f41dcf0ef9a33577b10fdea885a683fe48bbdb12d4ddcdd582c9e85518207e05917f3d79cd6d498ec75df5bfc6e0cf4259ab4be8f9ecc63dc93ee1f1f201a
-  data.tar.gz: b018bcea0135c005bba067582ff783ddd7b3ba333338607a6f539e9a77dae05316acfbbcc16333330840ecc0b73480285d729656d1b271d68885de64cdccebae
+  metadata.gz: 7915b0dce16a3c76e8da7c1a9d10271ae9ea814435282ad83a4d6debc580d588a9d90e876b30fa3a47382eda373d66165abd824b2d330ad280716e392e033998
+  data.tar.gz: b7e1c10531b3a3a90ed00c5c1b3ac19f9495d7094b5553197b6d34fd4cde6f6718eb87ba58527b388d0fc81cd760fe0019d6a8cb9e8f1b884941a3403e36618d

data/capdocker.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capdocker}
-  s.version = "1.0.52"
+  s.version = "1.0.53"
   s.authors = ["Ross Riley", "One Black Bear"]
   s.email = %q{ross@oneblackbear.com}
   s.date = Time.now
   s.require_paths = ["lib"]
   s.description = %q{An extension to Capistrano to handle deploys for One Black Bear docker containers.}
   s.files = [
-    "capdocker.gemspec", 
-    "lib/capdocker.rb", 
+    "capdocker.gemspec",
+    "lib/capdocker.rb",
     "lib/docker.rb",
     "lib/docker_deploy.rb",
     "lib/templates/nginx_host.erb",
     "lib/templates/nginx_container.erb",
     "lib/templates/Dockerfile.erb"
-  ] 
+  ]
   s.homepage = %q{http://oneblackbear.com}
   s.summary = %q{Deploy skeleton apps to docker container.}
   s.add_dependency 'capistrano', "~> 2.13.5"

data/lib/docker.rb

@@ -1,6 +1,6 @@
-Capistrano::Configuration.instance(:must_exist).load do  
+Capistrano::Configuration.instance(:must_exist).load do
 
-	namespace :docker do 
+	namespace :docker do
 
 		desc "build an updated box, restart container"
 	  task :build do
@@ -15,7 +15,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 		cmd = "docker run -p #{app_port}:80 "
 		cmd << "-v /home/docker/mounts/#{application}/mysql:/data/mysql:rw "
 		volumes.each do |vol|
-			run "mkdir -p -m7777 /home/docker/mounts/#{application}/#{vol}" 
+			run "mkdir -p -m7777 /home/docker/mounts/#{application}/#{vol}"
 			cmd << "-v /home/docker/mounts/#{application}/#{vol}:/var/www/#{vol}:rw "
 		end
 		cmd << "-name #{application} "
@@ -23,4 +23,4 @@ Capistrano::Configuration.instance(:must_exist).load do
 		cmd
 	end
 
-end	
+end

data/lib/templates/Dockerfile.erb

@@ -1,7 +1,6 @@
-# nginx + PHP5-FPM + MariaDB on Docker
+# Uses the oneblackbear trusted build and adds files
 #
-# VERSION               0.0.1
-FROM        ubuntu:12.04
+FROM        oneblackbear/dockerbase:latest
 MAINTAINER  Ross Riley "ross@oneblackbear.com"
 VOLUME ["/data/mysql"]
 <% volumes.each do |vol| %>
@@ -9,45 +8,6 @@ VOLUME ["<%= "/var/www/" + vol.gsub(/^\//,"") %>"]
 <% end %>
 
 
-# Update packages
-RUN echo "deb http://archive.ubuntu.com/ubuntu/ precise universe" >> /etc/apt/sources.list
-RUN apt-get update
-
-# install curl, wget
-RUN apt-get install -y curl wget git
-
-# Configure repos
-RUN apt-get install -y python-software-properties
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
-RUN add-apt-repository 'deb http://mirrors.linsrv.net/mariadb/repo/5.5/ubuntu precise main'
-RUN add-apt-repository -y ppa:nginx/stable
-RUN add-apt-repository -y ppa:ondrej/php5
-RUN apt-get update
-
-# Install MariaDB
-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
-
-# tell Nginx to stay foregrounded
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-
-# Install PHP5 and modules
-RUN apt-get -y install php5-fpm php5-mysql php-apc php5-mcrypt php5-curl php5-gd php5-json php5-cli
-RUN sed -i -e "s/short_open_tag = Off/short_open_tag = On/g" /etc/php5/fpm/php.ini
-RUN curl -sS https://getcomposer.org/installer | php
-RUN mv composer.phar /usr/local/bin/composer
-
-# Configure nginx for PHP websites
-ADD platform/nginx_container.conf /etc/nginx/sites-available/default
-RUN echo "cgi.fix_pathinfo = 0;" >> /etc/php5/fpm/php.ini
-RUN mkdir -p /var/www 
-EXPOSE 80
-
 # Copy across the local files to the root directory
 ADD ./ /var/www/
 
@@ -55,7 +15,3 @@ ADD ./ /var/www/
 # Run composer to install dependencies
 RUN cd /var/www/ && composer install
 RUN chown -R www-data:www-data /var/www
-
-#And Start
-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.52
+  version: 1.0.53
 platform: ruby
 authors:
 - Ross Riley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano