capdocker 1.0.52 → 1.0.53
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/capdocker.gemspec +4 -4
- data/lib/docker.rb +4 -4
- data/lib/templates/Dockerfile.erb +2 -46
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5ad835aa251fac56310c83b81aaf2df9b045244f
|
4
|
+
data.tar.gz: d3d0e5010d2b8f031b90995b52a81c3949582cb8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7915b0dce16a3c76e8da7c1a9d10271ae9ea814435282ad83a4d6debc580d588a9d90e876b30fa3a47382eda373d66165abd824b2d330ad280716e392e033998
|
7
|
+
data.tar.gz: b7e1c10531b3a3a90ed00c5c1b3ac19f9495d7094b5553197b6d34fd4cde6f6718eb87ba58527b388d0fc81cd760fe0019d6a8cb9e8f1b884941a3403e36618d
|
data/capdocker.gemspec
CHANGED
@@ -2,21 +2,21 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = %q{capdocker}
|
5
|
-
s.version = "1.0.
|
5
|
+
s.version = "1.0.53"
|
6
6
|
s.authors = ["Ross Riley", "One Black Bear"]
|
7
7
|
s.email = %q{ross@oneblackbear.com}
|
8
8
|
s.date = Time.now
|
9
9
|
s.require_paths = ["lib"]
|
10
10
|
s.description = %q{An extension to Capistrano to handle deploys for One Black Bear docker containers.}
|
11
11
|
s.files = [
|
12
|
-
"capdocker.gemspec",
|
13
|
-
"lib/capdocker.rb",
|
12
|
+
"capdocker.gemspec",
|
13
|
+
"lib/capdocker.rb",
|
14
14
|
"lib/docker.rb",
|
15
15
|
"lib/docker_deploy.rb",
|
16
16
|
"lib/templates/nginx_host.erb",
|
17
17
|
"lib/templates/nginx_container.erb",
|
18
18
|
"lib/templates/Dockerfile.erb"
|
19
|
-
]
|
19
|
+
]
|
20
20
|
s.homepage = %q{http://oneblackbear.com}
|
21
21
|
s.summary = %q{Deploy skeleton apps to docker container.}
|
22
22
|
s.add_dependency 'capistrano', "~> 2.13.5"
|
data/lib/docker.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
|
-
Capistrano::Configuration.instance(:must_exist).load do
|
1
|
+
Capistrano::Configuration.instance(:must_exist).load do
|
2
2
|
|
3
|
-
namespace :docker do
|
3
|
+
namespace :docker do
|
4
4
|
|
5
5
|
desc "build an updated box, restart container"
|
6
6
|
task :build do
|
@@ -15,7 +15,7 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
15
15
|
cmd = "docker run -p #{app_port}:80 "
|
16
16
|
cmd << "-v /home/docker/mounts/#{application}/mysql:/data/mysql:rw "
|
17
17
|
volumes.each do |vol|
|
18
|
-
run "mkdir -p -m7777 /home/docker/mounts/#{application}/#{vol}"
|
18
|
+
run "mkdir -p -m7777 /home/docker/mounts/#{application}/#{vol}"
|
19
19
|
cmd << "-v /home/docker/mounts/#{application}/#{vol}:/var/www/#{vol}:rw "
|
20
20
|
end
|
21
21
|
cmd << "-name #{application} "
|
@@ -23,4 +23,4 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
23
23
|
cmd
|
24
24
|
end
|
25
25
|
|
26
|
-
end
|
26
|
+
end
|
@@ -1,7 +1,6 @@
|
|
1
|
-
#
|
1
|
+
# Uses the oneblackbear trusted build and adds files
|
2
2
|
#
|
3
|
-
|
4
|
-
FROM ubuntu:12.04
|
3
|
+
FROM oneblackbear/dockerbase:latest
|
5
4
|
MAINTAINER Ross Riley "ross@oneblackbear.com"
|
6
5
|
VOLUME ["/data/mysql"]
|
7
6
|
<% volumes.each do |vol| %>
|
@@ -9,45 +8,6 @@ VOLUME ["<%= "/var/www/" + vol.gsub(/^\//,"") %>"]
|
|
9
8
|
<% end %>
|
10
9
|
|
11
10
|
|
12
|
-
# Update packages
|
13
|
-
RUN echo "deb http://archive.ubuntu.com/ubuntu/ precise universe" >> /etc/apt/sources.list
|
14
|
-
RUN apt-get update
|
15
|
-
|
16
|
-
# install curl, wget
|
17
|
-
RUN apt-get install -y curl wget git
|
18
|
-
|
19
|
-
# Configure repos
|
20
|
-
RUN apt-get install -y python-software-properties
|
21
|
-
RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
|
22
|
-
RUN add-apt-repository 'deb http://mirrors.linsrv.net/mariadb/repo/5.5/ubuntu precise main'
|
23
|
-
RUN add-apt-repository -y ppa:nginx/stable
|
24
|
-
RUN add-apt-repository -y ppa:ondrej/php5
|
25
|
-
RUN apt-get update
|
26
|
-
|
27
|
-
# Install MariaDB
|
28
|
-
RUN apt-get -y install mariadb-server
|
29
|
-
RUN sed -i 's/^innodb_flush_method/#innodb_flush_method/' /etc/mysql/my.cnf
|
30
|
-
RUN sed -i "/^datadir*/ s|=.*|=/data/mysql|" /etc/mysql/my.cnf
|
31
|
-
RUN chown -R mysql:mysql /data/mysql
|
32
|
-
|
33
|
-
# Install nginx
|
34
|
-
RUN apt-get -y install nginx
|
35
|
-
|
36
|
-
# tell Nginx to stay foregrounded
|
37
|
-
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
|
38
|
-
|
39
|
-
# Install PHP5 and modules
|
40
|
-
RUN apt-get -y install php5-fpm php5-mysql php-apc php5-mcrypt php5-curl php5-gd php5-json php5-cli
|
41
|
-
RUN sed -i -e "s/short_open_tag = Off/short_open_tag = On/g" /etc/php5/fpm/php.ini
|
42
|
-
RUN curl -sS https://getcomposer.org/installer | php
|
43
|
-
RUN mv composer.phar /usr/local/bin/composer
|
44
|
-
|
45
|
-
# Configure nginx for PHP websites
|
46
|
-
ADD platform/nginx_container.conf /etc/nginx/sites-available/default
|
47
|
-
RUN echo "cgi.fix_pathinfo = 0;" >> /etc/php5/fpm/php.ini
|
48
|
-
RUN mkdir -p /var/www
|
49
|
-
EXPOSE 80
|
50
|
-
|
51
11
|
# Copy across the local files to the root directory
|
52
12
|
ADD ./ /var/www/
|
53
13
|
|
@@ -55,7 +15,3 @@ ADD ./ /var/www/
|
|
55
15
|
# Run composer to install dependencies
|
56
16
|
RUN cd /var/www/ && composer install
|
57
17
|
RUN chown -R www-data:www-data /var/www
|
58
|
-
|
59
|
-
#And Start
|
60
|
-
CMD service mysql start; php5-fpm; nginx -c /etc/nginx/nginx.conf
|
61
|
-
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: capdocker
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.53
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ross Riley
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-11-
|
12
|
+
date: 2013-11-12 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: capistrano
|