ventriloquist 0.3.2 → 0.4.0

data/lib/ventriloquist/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Ventriloquist
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

data/locales/en.yml

@@ -1 +1,6 @@
-vagrant:
+en:
+  ventriloquist:
+    install_packages_unsupported: |-
+      The guest VM does not support installing packages! Please open an issue
+      at https://github.com/fgrehm/ventriloquist/issues reporting your guest
+      distribution.

data/services/base/Dockerfile

@@ -1,6 +1,4 @@
 # Base image for creating Ventriloquist services
-#
-# VERSION               0.0.1
 
 FROM ubuntu:quantal
 MAINTAINER Fabio Rehm "fgrehm@gmail.com"
@@ -8,8 +6,11 @@ MAINTAINER Fabio Rehm "fgrehm@gmail.com"
 ENV LC_ALL C
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN echo "deb http://archive.ubuntu.com/ubuntu quantal main universe" > /etc/apt/sources.list
-RUN apt-get update && apt-get -y upgrade && apt-get clean
-
-RUN apt-get install -y wget curl vim language-pack-en build-essential software-properties-common && apt-get autoremove && apt-get clean
-RUN locale-gen en_US && echo 'LANG="en_US.UTF-8"' >> /etc/default/locale
+RUN echo "deb http://archive.ubuntu.com/ubuntu quantal main universe" > /etc/apt/sources.list && \
+    apt-get update && \
+    apt-get -y upgrade && \
+    apt-get install -y wget curl vim language-pack-en build-essential software-properties-common && \
+    apt-get autoremove && \
+    apt-get clean && \
+    locale-gen en_US && \
+    echo 'LANG="en_US.UTF-8"' >> /etc/default/locale

data/services/build-all.sh

@@ -6,11 +6,14 @@ PREFIX='fgrehm/ventriloquist'
 
 docker build -t ${PREFIX}-base base
 
-docker build -t ${PREFIX}-pg:latest postgresql/9.2
-docker tag ${PREFIX}-pg:latest ${PREFIX}-pg 9.2
+docker build -t ${PREFIX}-pg postgresql/9.3
+docker build -t ${PREFIX}-pg:9.2 postgresql/9.2
 docker build -t ${PREFIX}-pg:9.1 postgresql/9.1
 
-docker build -t ${PREFIX}-mysql mysql
+docker build -t ${PREFIX}-mysql mysql/5.6
+docker build -t ${PREFIX}-mysql:5.5 mysql/5.5
+
+docker build -t ${PREFIX}-rethinkdb rethinkdb
 
 docker build -t ${PREFIX}-openjdk7 openjdk7
 docker build -t ${PREFIX}-elasticsearch elasticsearch

data/services/elasticsearch/Dockerfile

@@ -1,12 +1,11 @@
-# Elasticsearch 0.90.3
-#
-# VERSION               0.0.1
+# Elasticsearch
 
 FROM fgrehm/ventriloquist-openjdk7
-MAINTAINER Fabio Rehm "fgrehm@gmail.com"
 
-ADD . /
-RUN /tmp/install-elasticsearch.sh && rm /tmp/install-elasticsearch.sh
+RUN wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.7.deb -O /tmp/elasticsearch.deb -q --no-check-certificate && \
+    dpkg -i /tmp/elasticsearch.deb && \
+    rm /tmp/elasticsearch.deb && \
+    apt-get clean
 
-EXPOSE 9200:9200
+EXPOSE 9200
 CMD    ["/usr/share/elasticsearch/bin/elasticsearch", "-f"]

data/services/mailcatcher/Dockerfile

@@ -1,13 +1,10 @@
-# MailCatcher X.X.X
-#
-# VERSION               0.0.1
+# MailCatcher
 
 FROM fgrehm/ventriloquist-base
-MAINTAINER Fabio Rehm "fgrehm@gmail.com"
 
 RUN apt-get install -y ruby ruby-dev sqlite3 libsqlite3-dev && apt-get clean
 RUN gem install mailcatcher --no-ri --no-rdoc
 
-EXPOSE 1025:1025
-EXPOSE 1080:1080
+EXPOSE 1025
+EXPOSE 1080
 CMD    ["/usr/local/bin/mailcatcher", "-f", "--ip", "0.0.0.0"]

data/services/memcached/Dockerfile

@@ -1,17 +1,16 @@
 # Memcached
-#
-# VERSION               0.0.1
 
 FROM fgrehm/ventriloquist-base
-MAINTAINER Fabio Rehm "fgrehm@gmail.com"
 
-# prevent apt from starting postgres right after the installation
-RUN echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d; chmod +x /usr/sbin/policy-rc.d
+RUN wget -q http://memcached.googlecode.com/files/memcached-1.4.15.tar.gz -O /tmp/memcached.tar.gz && \
+    cd /tmp && \
+    tar xvfz memcached.tar.gz && \
+    cd memcached-1.4.15 && \
+    apt-get install libevent1-dev -y && \
+    ./configure --prefix=/usr/local/memcached && \
+    make && \
+    make install && \
+    cd .. && rm -rf memcached* && apt-get clean
 
-RUN apt-get install -y -q memcached && apt-get clean
-
-# allow autostart again
-RUN rm /usr/sbin/policy-rc.d
-
-EXPOSE 11211:11211
-CMD    ["/usr/bin/memcached", "-u", "daemon"]
+EXPOSE 11211
+CMD    ["/usr/local/memcached/bin/memcached", "-u", "daemon"]

data/services/mysql/5.5/Dockerfile

@@ -0,0 +1,17 @@
+# MySQL 5.5
+
+FROM fgrehm/ventriloquist-base
+
+# prevent apt from starting mysql right after the installation
+RUN echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d; chmod +x /usr/sbin/policy-rc.d && \
+    apt-get -q -y install mysql-server-5.5 && \
+    apt-get clean && \
+    sed -i 's/127.0.0.1/0.0.0.0/' /etc/mysql/my.cnf && \
+    apt-get clean && \
+    rm /usr/sbin/policy-rc.d # allow autostart again
+
+ADD config /
+RUN /bin/add-mysql-user
+
+EXPOSE  3306
+CMD     ["/usr/sbin/mysqld"]

data/services/mysql/{config → 5.5/config}/bin/add-mysql-user

@@ -2,14 +2,9 @@
 
 set -e
 
-user=$1
-password=$2
-
 user='vagrant'
 password='vagrant'
 
-sed -i 's/127.0.0.1/0.0.0.0/' /etc/mysql/my.cnf
-
 mysqld& sleep 3
 
 mysqladmin -u root password $password

data/services/mysql/5.6/Dockerfile

@@ -0,0 +1,32 @@
+# MySQL 5.6
+# Somehow based on http://www.peterchen.net/2013/02/20/en-how-to-install-mysql-5-6-on-ubuntu-12-04-precise/
+
+FROM fgrehm/ventriloquist-base
+
+RUN apt-get install libaio-dev -y && \
+    wget -q http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb -O /tmp/mysql.deb && \
+    dpkg -i /tmp/mysql.deb && \
+    rm /tmp/mysql.deb && \
+    groupadd mysql && \
+    useradd -r -g mysql mysql && \
+    mkdir -p /etc/mysql/conf.d && \
+    mkdir -p /var/log/mysql && \
+    mkdir -p /var/run/mysqld && \
+    chown -R mysql:mysql /opt/mysql/server-5.6 && \
+    chown -R mysql:mysql /var/run/mysqld && \
+    /opt/mysql/server-5.6/scripts/mysql_install_db --user=mysql --datadir=/var/lib/mysql && \
+    rm /opt/mysql/server-5.6/my*.cnf && \
+    echo 'export PATH="/opt/mysql/server-5.6/bin:$PATH"' > /etc/profile.d/mysql.sh && \
+    apt-get clean && \
+    rm /opt/mysql/server-5.6/bin/mysqld-debug && \
+    rm /opt/mysql/server-5.6/bin/mysqltest_* && \
+    rm /opt/mysql/server-5.6/bin/mysql_client_test* && \
+    rm /opt/mysql/server-5.6/lib/libmysqld-debug.a && \
+    rm -rf /opt/mysql/server-5.6/mysql-test # Save some disk space
+
+ADD config /
+
+RUN /bin/add-mysql-user
+
+EXPOSE  3306
+CMD     ["/opt/mysql/server-5.6/bin/mysqld"]

data/services/mysql/5.6/config/bin/add-mysql-user

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+user='vagrant'
+password='vagrant'
+
+source /etc/profile.d/mysql.sh
+mysqld& sleep 3
+
+mysqladmin -u root password $password
+
+echo "create user '${user}'@'%' identified by '${password}';" | mysql -u root -p$password
+echo "grant all on *.* to '${user}'@'%' with grant option;" | mysql -u root -p$password
+echo "FLUSH PRIVILEGES;" | mysql -uroot -p${password}

data/services/mysql/5.6/config/etc/my.cnf

@@ -0,0 +1,129 @@
+#
+# The MySQL database server configuration file.
+#
+# You can copy this to one of:
+# - "/etc/mysql/my.cnf" to set global options,
+# - "~/.my.cnf" to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+# This will be passed to all mysql clients
+# It has been reported that passwords should be enclosed with ticks/quotes
+# escpecially if they contain "#" chars...
+# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
+[client]
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+# Here is entries for some specific programs
+# The following values assume you have at least 32M ram
+
+# This was formally known as [safe_mysqld]. Both versions are currently parsed.
+[mysqld_safe]
+socket		= /var/run/mysqld/mysqld.sock
+nice		= 0
+
+[mysqld]
+#
+# * Basic Settings
+#
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+# basedir		= /usr
+basedir		= /opt/mysql/server-5.6
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+# lc-messages-dir	= /usr/share/mysql
+lc-messages-dir	= /opt/mysql/server-5.6/share
+skip-external-locking
+#
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+bind-address		= 0.0.0.0
+#
+# * Fine Tuning
+#
+key_buffer		= 16M
+max_allowed_packet	= 16M
+thread_stack		= 192K
+thread_cache_size       = 8
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+myisam-recover         = BACKUP
+#max_connections        = 100
+#table_cache            = 64
+#thread_concurrency     = 10
+#
+# * Query Cache Configuration
+#
+query_cache_limit	= 1M
+query_cache_size        = 16M
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/log/mysql/mysql.log
+#general_log             = 1
+#
+# Error log - should be very few entries.
+#
+log_error = /var/log/mysql/error.log
+#
+# Here you can see queries with especially long duration
+#log_slow_queries	= /var/log/mysql/mysql-slow.log
+#long_query_time = 2
+#log-queries-not-using-indexes
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id		= 1
+#log_bin			= /var/log/mysql/mysql-bin.log
+expire_logs_days	= 10
+max_binlog_size         = 100M
+#binlog_do_db		= include_database_name
+#binlog_ignore_db	= include_database_name
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet	= 16M
+
+[mysql]
+#no-auto-rehash	# faster start of mysql but no tab completition
+
+[isamchk]
+key_buffer		= 16M
+
+#
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+!includedir /etc/mysql/conf.d/

data/services/openjdk7/Dockerfile

@@ -1,9 +1,5 @@
-# Elasticsearch
-# PostgreSQL 9.1 and 9.2
-#
-# VERSION               0.0.1
+# Base openjdk image
 
 FROM fgrehm/ventriloquist-base
-MAINTAINER Fabio Rehm "fgrehm@gmail.com"
 
 RUN apt-get install -y openjdk-7-jre-headless && apt-get clean

data/services/postgresql/9.1/Dockerfile

@@ -1,20 +1,15 @@
 # PostgreSQL 9.1
-#
-# VERSION               0.0.1
 
 FROM fgrehm/ventriloquist-base
-MAINTAINER Fabio Rehm "fgrehm@gmail.com"
 
 # prevent apt from starting postgres right after the installation
-RUN echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d; chmod +x /usr/sbin/policy-rc.d
-
-RUN apt-get install -y -q postgresql-9.1 postgresql-contrib-9.1 && apt-get clean
-
-# allow autostart again
-RUN rm /usr/sbin/policy-rc.d
+RUN echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d; chmod +x /usr/sbin/policy-rc.d && \
+    apt-get install -y -q postgresql-9.1 postgresql-contrib-9.1 && \
+    apt-get clean && \
+    rm /usr/sbin/policy-rc.d # allow autostart again
 
 ADD config /
 RUN /bin/prepare-postgres vagrant vagrant
 
-EXPOSE  5432:5432
+EXPOSE  5432
 CMD     ["/bin/start-postgres"]

data/services/postgresql/9.2/Dockerfile

@@ -1,15 +1,16 @@
 # PostgreSQL 9.2
-#
-# VERSION               0.0.1
 
 FROM fgrehm/ventriloquist-base
-MAINTAINER Fabio Rehm "fgrehm@gmail.com"
 
-RUN add-apt-repository ppa:pitti/postgresql && apt-get update
-RUN apt-get install -y postgresql-9.2 postgresql-contrib-9.2 && apt-get clean
+RUN wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add - && \
+    echo "deb http://apt.postgresql.org/pub/repos/apt precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+    apt-get update
+
+RUN apt-get install -y postgresql-9.2 postgresql-contrib-9.2 && \
+    apt-get clean
 
 ADD config /
 RUN /bin/prepare-postgres vagrant vagrant
 
-EXPOSE  5432:5432
+EXPOSE  5432
 CMD     ["/bin/start-postgres"]

data/services/postgresql/9.3/Dockerfile

@@ -0,0 +1,16 @@
+# PostgreSQL 9.3
+
+FROM fgrehm/ventriloquist-base
+
+RUN wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add - && \
+    echo "deb http://apt.postgresql.org/pub/repos/apt precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+    apt-get update
+
+RUN apt-get install -y postgresql-9.3 postgresql-contrib-9.3 && \
+    apt-get clean
+
+ADD config /
+RUN /bin/prepare-postgres vagrant vagrant
+
+EXPOSE  5432
+CMD     ["/bin/start-postgres"]

data/services/postgresql/9.3/config/bin/prepare-postgres

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+user=$1
+password=$2
+
+/etc/init.d/postgresql start
+
+su postgres -c "createuser --superuser ${user}"
+su postgres -c "createdb ${user}"
+su postgres -c "psql -c \"ALTER ROLE ${user} PASSWORD '${password}'\""
+
+# Based on https://gist.github.com/ffmike/877447
+su postgres -c "psql postgres -c \"update pg_database set datallowconn = TRUE where datname = 'template0';\""
+su postgres -c "psql template0 -c \"update pg_database set datistemplate = FALSE where datname = 'template1';\""
+su postgres -c "psql template0 -c \"drop database template1;\""
+su postgres -c "psql template0 -c \"create database template1 with template = template0 encoding = 'UTF8';\""
+su postgres -c "psql template0 -c \"update pg_database set datistemplate = TRUE where datname = 'template1';\""
+su postgres -c "psql template1 -c \"update pg_database set datallowconn = FALSE where datname = 'template0';\""
+
+/etc/init.d/postgresql stop
+
+# Avoid password for local connections
+echo 'host all all all trust' >> /etc/postgresql/9.3/main/pg_hba.conf