linux_provision 0.9.6 → 0.9.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2E1M2I4NDY2MGU5ZmU1ZjA2YjI3MTZkOTA5OTRhZWFjZTVjODFjMA==
+    MDUzZjY4NGRiZGIwZWIyOGM0MDI4Y2Q4OTZlNTI1ZDRmMWRiNzI4MQ==
   data.tar.gz: !binary |-
-    MWVhNjljMjE2NjQ1YWZhZmVkY2YwZWU3NjFkNjBjYWJiMjBmZDE0OA==
+    ZDU3Mjc4OWNmYzYxZjQxZTEyMDk2MmY5NDk2YzVmNGI1MzFiNjQ2NA==
 SHA512:
   metadata.gz: !binary |-
-    MGFlZGUzOGRmMDcxMzU5NjhlZGUxMWY3MDM3ZTBhNmJmZWM2NjExYmI0MWNl
-    ZmYyMzZhNWU1OThhNjc0MzJiYWEyMDQ5YTRhMGMyYjE5YTJhOTM0OTNjMThl
-    NGYzZGE4ZDQ2YWI3NzgzNzUyNDY5MTBjMTExYzAyN2Q5ZjE5MDE=
+    NDY1MDNiNTI0MzM4YjQ5ODE2OTY5ZDFhZTIyM2ZkNzE2ODdlY2EwNDM0MDQ3
+    ZjBlMzk1NDA5ZGQ4YzRkMDkxNGRlNTVkMTM3NWRkNzViNjRkMjkxMGM2ODVi
+    ZmM2N2M4NzMyOGIxNjM4ZWJhZTRlODE3ZGZhMDEyZWUyZDI4MTg=
   data.tar.gz: !binary |-
-    ZmM0YWZiZDdiM2RiMWY1M2VlOTY4N2UxNjliNWM4MDg1ZDM4NWJiYmI4NjIy
-    NTlhOGM1OWUxNDc5M2Y0YWRiMGZiNWIwYTcxMDQ3NmUxOTUyNjU0ZjM3ZjFl
-    NWIzMDQzMGUxMmVlMmYyZDUzYWU1M2NjYzhjMDBlYjdhNzc4ZDM=
+    NDNiOTcxMmQ2ODBlNWEzOTAwZjVkYTEyNzNhMTM5ODAwNTU2MjU1NTIxMjAw
+    ZjRiYjE1M2NiYWQ5ZDU1NDNjMzU0ZDA2M2EyZGVmMDFmM2RiNDFiZjI3ZDg4
+    MTBmYjI3NzQ2NzFlNDFiMWNiZjMxODNiOTJiYmMxNTI2ZGJiNjU=

data/.linux_provision.json

@@ -1,15 +1,17 @@
 {
   "node": {
-    "domain": "22.22.22.22",
+    //"domain": "22.22.22.22",
+    "domain": "192.168.59.103",
     "user": "vagrant",
     "password": "vagrant",
     "home": "/home/vagrant",
-    "port": "2222",
+    //"port": "22",
+    "port": "42222",
     "remote": true
   },
 
   "project": {
-    "home": "#{node.home}/linux_provision/demo",
+    "home": "#{node.home}/demo",
     "ruby_version": "1.9.3",
     "gemset": "linux_provision"
   },

data/CHANGES

@@ -26,4 +26,8 @@
 
 == Version 0.9.6
 
-* Bump script_executor version.
+* Bump script_executor version.
+
+== Version 0.9.7
+
+* Adding support for docker.

data/Gemfile.lock

@@ -48,7 +48,7 @@ GEM
       rake (>= 0.8.1)
     ruby-debug-ide (0.4.23.beta1)
       rake (>= 0.8.1)
-    script_executor (1.5.0)
+    script_executor (1.5.1)
       highline (~> 1.6)
       json_pure (~> 1.8)
       net-ssh (~> 2.8)

data/Vagrantfile

@@ -1,27 +1,54 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# # Commands required to setup working docker enviro, link containers etc.
-# $setup = <<SCRIPT
-# echo "setup"
-# SCRIPT
-#
-# # Commands required to ensure correct docker containers are started when the vm is rebooted.
-# $start = <<SCRIPT
-# echo "start"
-#
-# #PATH=$PATH:/usr/local/bin
-#
-# #source /usr/local/rvm/scripts/rvm
-#
-# #cd /vagrant
-#
-# #rvm use 1.9.3@n2
-#
-# # bundle --without production
-#
-# #rails s &
-# SCRIPT
+# Commands required to setup working docker enviro, link containers etc.
+$setup = <<SCRIPT
+echo "Setup..."
+
+cd /home/vagrant/demo
+
+# Stop and remove any existing containers
+docker stop $(docker ps -a -q)
+docker rm $(docker ps -a -q)
+
+#docker stop demo
+#docker rm demo
+
+# Build containers from Dockerfiles
+# docker build -t postgres docker/postgres
+# docker build -t rails docker/rails
+
+docker build -t demo demo
+
+# Run and link the containers
+# docker run -d -p 5432:5432 --name postgres postgres
+# docker run --rm -p 9292:9292 --name rails rails ls
+#docker run -d --name postgres -e POSTGRESQL_USER=docker -e POSTGRESQL_PASS=docker postgres:latest
+#docker run --rm -p 42222:22 -p 9292:9292 -e POSTGRESQL_HOST='192.168.59.103' --name demo demo:latest /bin/bash -l -c "rackup"
+
+docker run -d -p 42222:22 -p 9292:9292 --name demo demo
+
+SCRIPT
+
+# Commands required to ensure correct docker containers are started when the vm is rebooted.
+$start = <<SCRIPT
+echo "Start..."
+
+# docker start postgres
+# docker start rails
+
+docker start demo
+
+PATH=$PATH:/usr/local/bin
+
+source $HOME/.rvm/scripts/rvm
+
+cd $HOME/demo
+
+rvm use 1.9.3@linux_provision_demo
+
+rackup
+SCRIPT
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
@@ -44,7 +71,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
   # config.vm.network "forwarded_port", guest: 80, host: 8080
-  config.vm.network "forwarded_port", host: 9292, guest: 9292
+  config.vm.network "forwarded_port", guest: 9292, host: 9292
+  config.vm.network "forwarded_port", guest: 5432, host: 5433
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
@@ -64,7 +92,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
   # config.vm.synced_folder "../data", "/vagrant_data"
-  config.vm.synced_folder "../linux_provision", "/home/vagrant/linux_provision"
+  #config.vm.synced_folder "../linux_provision/demo", "/home/vagrant/demo"
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
@@ -78,6 +106,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #   vb.customize ["modifyvm", :id, "--memory", "1024"]
   # end
   #
+
+  # config.vm.provision "docker"
+  #
+  # # Setup resource requirements
+  # config.vm.provider "virtualbox" do |v|
+  #   v.memory = 2048
+  #   v.cpus = 2
+  # end
+
   # View the documentation for the provider you're using for more
   # information on available options.
 
@@ -147,9 +184,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Setup the containers when the VM is first created
   # config.vm.provision :shell, :path => "bootstrap.sh"
-  # config.vm.provision "shell", inline: $setup
+  #config.vm.provision "shell", inline: $setup
 
   # Make sure the correct containers are running
   # every time we start the VM.
-  # config.vm.provision "shell", run: "always", inline: $start
+  #config.vm.provision "shell", run: "always", inline: $start
 end

data/demo/Dockerfile

@@ -2,106 +2,57 @@ FROM ubuntu:14.04
 
 MAINTAINER Alexander Shvets "alexander.shvets@gmail.com"
 
-# 1. Install general packages
+# 1. Update system
 
-RUN apt-get update
+RUN sudo apt-get update
 
-RUN apt-get install -y curl
-RUN apt-get install -y g++
-RUN apt-get install -y  git
-RUN apt-get -y -q install libpq-dev
+RUN sudo locale-gen en_US.UTF-8
 
-# for rvm
-RUN apt-get -y -q install gawk make libreadline6-dev libyaml-dev libsqlite3-dev sqlite3
-RUN apt-get -y -q install autoconf libgdbm-dev libncurses5-dev automake libtool bison pkg-config libffi-dev
 
-# 3. Install postgres
-
-#RUN apt-get -y -q install postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
+# 2. Install sshd
 
-#USER postgres
+RUN sudo apt-get install -y openssh-server
 
-#ADD bin/create_db.sh /src/
-#RUN /src/create_db.sh
+RUN mkdir /var/run/sshd
 
-# Adjust PostgreSQL configuration so that remote connections to the
-# database are possible.
-#RUN echo "host all  all    0.0.0.0/0  md5" >> /etc/postgresql/9.3/main/pg_hba.conf
+RUN echo 'root:root' |chpasswd
 
-# And add ``listen_addresses`` to ``/etc/postgresql/9.3/main/postgresql.conf``
-#RUN echo "listen_addresses='*'" >> /etc/postgresql/9.3/main/postgresql.conf
+RUN sed --in-place=.bak 's/without-password/yes/' /etc/ssh/sshd_config
 
-# Expose the PostgreSQL port
-#EXPOSE 5432
+EXPOSE 22
 
-# Add VOLUMEs to allow backup of config, logs and databases
-#VOLUME  ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
+CMD /usr/sbin/sshd -D
 
-# Set the default command to run when starting the container
-#CMD ["/usr/lib/postgresql/9.3/bin/postgres", "-D", "/var/lib/postgresql/9.3/main", "-c", "config_file=/etc/postgresql/9.3/main/postgresql.conf"]
 
-#USER root
+# 3. Create vagrant user
 
-# 3. Install rvm & ruby
+RUN groupadd vagrant
+RUN useradd -d /home/vagrant -g vagrant -m -s /bin/bash vagrant
 
-RUN curl -L https://get.rvm.io | bash
+RUN sudo sed -i '$a vagrant    ALL=(ALL) NOPASSWD: ALL' /etc/sudoers
 
-RUN /bin/bash -l -c "source /etc/profile.d/rvm.sh && rvm install ruby-1.9.3"
+RUN echo vagrant:vagrant | chpasswd
 
-# 4. Install project
+RUN sudo chown -R vagrant /home/vagrant
 
-# Trick: make bundle command cashable
 
-WORKDIR /tmp
-ADD ./Gemfile Gemfile
-ADD ./Gemfile.lock Gemfile.lock
-RUN /bin/bash -l -c "rvm --create use 1.9.3@linux_provision_demo && bundle"
+# 4. Prepare directories for the project
 
 # Add project dir to docker
 
-ADD . /opt/demo
-WORKDIR /opt/demo
-
-# Add 'web' user which will run the application
-#RUN adduser web --home /home/web --shell /bin/bash --disabled-password --gecos ""
-
-#RUN chown -R web:web /var/www &&\
-#  mkdir -p /var/bundle &&\
-#  chown -R web:web /var/bundle
-#RUN su -c "cd /var/www && bundle install --deployment --path /var/bundle" -s /bin/bash -l web
-#RUN chown -R web:web /var/www
-#USER web
+ADD . /home/vagrant/demo
+WORKDIR /home/vagrant/demo
 
-#RUN chmod +x /opt/demo/bin/create_db.sh
-#RUN /bin/bash -l -c "rvm use 1.9.3@linux_provision_demo && rake db:migrate"
-
-# Make server port available outside
 EXPOSE 9292
 
-# Start server
-#ENTRYPOINT /opt/demo/bin/start-server.sh
-
-CMD /bin/bash -l -c "rackup"
-
-# 2. Install sshd
-
-#RUN apt-get install -y openssh-server supervisor
-
-#RUN mkdir /var/run/sshd
-#RUN mkdir -p /var/log/supervisor
-
-#RUN echo 'root:screencast' | chpasswd
-
-#EXPOSE 22
+# docker stop demo
+# docker rm demo
 
-#CMD /usr/sbin/sshd -D
-
-#ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-#CMD ["/usr/bin/supervisord"]
+# docker build -t demo demo
+# docker run -d -p 42222:22 -p 9292:9292 --name demo demo
+# ssh vagrant@192.168.59.103 -p 42222
+# ssh root@192.168.59.103 -p 42222
 
-# boot2docker ip
+# thor linux_install:general
+# thor linux_install:app
 
-# docker build -t demo demo
-# docker run --rm -p 9292:9292 -e POSTGRESQL_HOST='192.168.59.104' --name demo demo /bin/bash -l -c "rake db:migrate"
-# docker run --rm -p 9292:9292 -e POSTGRESQL_HOST='192.168.59.104' --name demo demo /bin/bash -l -c "rackup"

data/lib/linux_provision/linux_provision.rb

@@ -33,4 +33,8 @@ class LinuxProvision < BaseProvision
       run(server_info, "mysql_drop_schema", env.merge(schema: schema))
     end
   end
+
+  def service service, command
+    run(server_info, "service_command", env.merge(service: service, command: command))
+  end
 end

data/lib/linux_provision/linux_provision_scripts.sh

@@ -25,14 +25,13 @@ sudo apt-get install -y bison
 sudo apt-get install -y pkg-config
 sudo apt-get install -y libffi-dev
 
-
 #######################################
 [rvm]
 # Installs rvm
 
 curl -L https://get.rvm.io | bash
 
-sudo chown -R vagrant /opt/vagrant_ruby
+#sudo chown -R vagrant /opt/vagrant_ruby
 
 
 #######################################
@@ -68,6 +67,15 @@ sudo apt-get install -y postgresql-client
 sudo apt-get install -y libpq-dev
 sudo apt-get install -y postgresql
 
+sudo service postgresql restart
+
+
+#######################################
+[postgres_remote_access]
+
+sudo sed -i "s/#listen_addresses = 'localhost'/listen_addresses = '*'/g" /etc/postgresql/9.1/main/postgresql.conf
+sudo sed -i '$a host all all  0.0.0.0/0 md5' /etc/postgresql/9.1/main/pg_hba.conf
+
 
 #######################################
 [mysql]
@@ -89,6 +97,8 @@ sudo debconf-set-selections <<< "mysql-server-$MYSQL_SERVER_VERSION mysql-server
 
 sudo apt-get -y install mysql-server
 
+sudo service mysql restart
+
 #sudo mysqladmin -u$MYSQL_USER password $MYSQL_PASSWORD
 
 
@@ -191,6 +201,15 @@ MYSQL_PASSWORD='#{mysql.password}'
 mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "drop database $SCHEMA;"
 
 
+#######################################
+[service_command]
+
+SERVICE='#{service}'
+COMMAND='#{command}'
+
+sudo service $SERVICE $COMMAND
+
+
 #######################################
 [selenium]
 # http://www.labelmedia.co.uk/blog/setting-up-selenium-server-on-a-headless-jenkins-ci-build-machine.html

data/lib/linux_provision/version.rb

@@ -1,3 +1,3 @@
 class LinuxProvision
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/presentation/virtualization/03-docker/slides.md

@@ -147,7 +147,7 @@ docker build -t postgres docker/postgres
 docker build -t demo demo
 
 # Run and link the containers
-docker run -d -p 5432:5432 --name postgres postgres:latest
+docker run -d -p 5432:5432 --name postgres postgres
 
 docker run --rm -p 42222:22 -p 9292:9292 -e POSTGRESQL_HOST='192.168.59.103' --name demo demo:latest /bin/bash -l -c "rackup"
 

data/thor/demo_scripts.sh

@@ -12,7 +12,7 @@ cd $APP_HOME
 
 source $USER_HOME/.rvm/scripts/rvm
 
-rvm use #{project.ruby_version}@#{project.gemset}
+rvm use #{project.ruby_version}@#{project.gemset} --create
 
 bundle
 
@@ -31,4 +31,6 @@ cd $APP_HOME
 
 source $USER_HOME/.rvm/scripts/rvm
 
+rvm use #{project.ruby_version}@#{project.gemset}
+
 rackup

data/thor/docker.thor

@@ -13,12 +13,13 @@ class Docker < Thor
     # Build containers from Dockerfiles
     execute <<-CODE
     # Reset
-    # execute "docker stop $(docker ps -a -q)"
-    # execute "docker rm $(docker ps -a -q)"
+    docker stop demo
+    docker rm demo
 
     # Build containers
     # docker build -t postgres docker/postgres
     docker build -t demo demo
+    docker run -d -p 42222:22 -p 9292:9292 --name demo demo
 
     # Run and link the containers
     # docker run -d -p 5432:5432 --name postgres postgres:latest
@@ -28,4 +29,4 @@ class Docker < Thor
     # docker run -d -p 9292:9292 --name demo demo:latest /bin/bash -l -c "rackup"
     CODE
   end
-end
+end

data/thor/linux_install.thor

@@ -16,10 +16,14 @@ class LinuxInstall < Thor
     invoke :rvm
     invoke :ruby
 
-    invoke :node
-    invoke :jenkins
     invoke :postgres
     invoke :mysql
+  end
+
+  desc "special", "Installs special packages"
+  def special
+    invoke :node
+    invoke :jenkins
 
     # invoke :selenium
   end
@@ -38,6 +42,7 @@ class LinuxInstall < Thor
   desc "all", "Installs all required packages"
   def all
     invoke :general
+    invoke :special
     invoke :app
   end
 
@@ -61,6 +66,11 @@ class LinuxInstall < Thor
     LinuxInstall.installer.mysql_drop_schemas
   end
 
+  desc "service", "Executes command for service"
+  def service service, command
+    LinuxInstall.installer.service service, command
+  end
+
   desc "ssh", "ssh"
   def ssh
     #system "thor ssh:cp_key vagrant 22.22.22.22"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_provision
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: text-interpolator
@@ -127,23 +127,18 @@ files:
 - demo/Gemfile.lock
 - demo/Rakefile
 - demo/app.rb
-- demo/bin/start-server.sh
 - demo/config.ru
 - demo/db/migrate/20140610203958_create_notes.rb
 - demo/db/migrate/20140610204302_add_notes.rb
 - demo/db/schema.rb
 - demo/db_setup.rb
 - demo/note.rb
-- demo/supervisord.conf
 - demo/views/index.erb
 - demo/views/layout.erb
 - demo/views/new.erb
 - demo/views/note.erb
 - docker/postgres/Dockerfile
 - docker/postgres/bin/create_db.sh
-- docker/sshd/Dockerfile
-- docker/supervisord/Dockerfile
-- docker/supervisord/supervisord.conf
 - lib/linux_provision.rb
 - lib/linux_provision/linux_provision.rb
 - lib/linux_provision/linux_provision_scripts.sh

data/demo/bin/start-server.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cd /opt/demo
-
-source /etc/profile.d/rvm.sh
-
-bundle exec rackup

data/demo/supervisord.conf

@@ -1,8 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:sshd]
-command=/usr/sbin/sshd -D
-
-[program:rackup]
-command=/bin/bash -c "/opt/demo/bin/start-server.sh"

data/docker/sshd/Dockerfile

@@ -1,28 +0,0 @@
-# https://registry.hub.docker.com/u/dhrp/sshd/
-# http://stackoverflow.com/questions/23014684/how-to-get-ssh-connection-with-docker-container-on-osxboot2docker
-
-# sshd
-#
-# VERSION               0.0.1
-
-FROM     ubuntu
-MAINTAINER Thatcher R. Peskens "thatcher@dotcloud.com"
-
-# make sure the package repository is up to date
-RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-RUN apt-get update
-
-RUN apt-get install -y openssh-server
-RUN mkdir /var/run/sshd
-RUN echo 'root:screencast' |chpasswd
-
-EXPOSE 22
-
-CMD /usr/sbin/sshd -D
-
-# docker build -t sshd docker/sshd
-# docker run -d -P --name sshd sshd
-
-# docker port sshd 22
-# boot2docker ip
-# ssh root@192.168.59.104 -p 49153

data/docker/supervisord/Dockerfile

@@ -1,28 +0,0 @@
-# http://docs.docker.com/examples/using_supervisord/
-
-FROM ubuntu:latest
-MAINTAINER examples@docker.io
-
-RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-RUN apt-get update
-RUN apt-get upgrade -y
-
-RUN apt-get install -y openssh-server apache2 supervisor
-RUN mkdir -p /var/run/sshd
-RUN mkdir -p /var/log/supervisor
-
-RUN echo 'root:screencast' |chpasswd
-
-ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-EXPOSE 22 80
-
-CMD ["/usr/bin/supervisord"]
-
-
-# docker build -t supervisord docker/supervisord
-# docker run -p 22 -p 80 -t -i --name supervisord supervisord
-
-# docker port sshd 22
-# boot2docker ip
-# ssh root@192.168.59.104 -p 49154

data/docker/supervisord/supervisord.conf

@@ -1,8 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:sshd]
-command=/usr/sbin/sshd -D
-
-[program:apache2]
-command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"