F/docker editing

composer.json

@@ -26,7 +26,7 @@
         "mrbase/smesg": "*",
         "ekino/newrelic-bundle": "master-dev",
         "liip/theme-bundle": "dev-master",
-        "drak/native-session": "master-dev",
+        "drak/native-session": "dev-master",
         "misd/guzzle-bundle": "~1.0",
 
         "knplabs/knp-snappy-bundle": "1.1",

tools/docker/db/Dockerfile

@@ -21,7 +21,7 @@ ADD ./add-files/dotdeb.list /etc/apt/sources.list.d/dotdeb.list
 
 RUN apt-get -q -y update;\
   apt-get -q -y upgrade;\
-  apt-get -q -y install ssh vim pwgen locales mysql-server-5.5 mysql-client-5.5 redis-server redis-tools beanstalkd
+  apt-get -q -y install ssh vim pwgen locales mysql-server-5.5 redis-server redis-tools beanstalkd
 
 # Locales
 RUN sed -i -e 's/# da_DK.UTF-8/da_DK.UTF-8/' /etc/locale.gen;\

tools/docker/db/add-files/startup-in-container.sh

@@ -1,13 +1,31 @@
 #!/bin/bash
 MYSQL_PASS=my5QLpw
 
-service ssh start
-service mysql start
+# Variables
+VOLUME_HOME="/var/lib/mysql"
+LOG="/var/log/mysql/error.log"
 
-mysql -u root --password=$MYSQL_PASS -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '${MYSQL_PASS}' WITH GRANT OPTION; FLUSH PRIVILEGES;"
 
+# Start services
+service ssh start
 service redis-cache start
 service redis-server start
 service beanstalkd start
 
-tail -f /var/log/dmesg
+
+# No database is set
+if [[ ! -d $VOLUME_HOME/mysql ]]; then
+
+    # Set permissions
+    chmod -R 777 $VOLUME_HOME
+
+    # Install default database
+    mysql_install_db
+
+    # Set permissions correctly
+    mysql -u root --password=$MYSQL_PASS -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '${MYSQL_PASS}' WITH GRANT OPTION; FLUSH PRIVILEGES;"
+fi
+
+# Prevent script-stopping and start MySQL
+tail -F $LOG &
+exec mysqld_safe

tools/docker/db/build.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --rm -t hf/pompdelux-db:wheezy .
+docker build --rm -t bellcom/pompdelux-db:wheezy .

tools/docker/mysql/wheezy/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitkeep

tools/docker/nginx/nginx.vhost.conf.dist

@@ -1,7 +1,7 @@
 server {
   listen 80;
 
-  server_name pdl.hf c.pdl.hf admin.pdl.hf www.pdl.hf;
+  server_name pompdelux.local c.pompdelux.local admin.pompdelux.local www.pompdelux.local;
   root /var/www/pompdelux/web/;
 
   error_log /var/www/logs/error.log;
@@ -28,7 +28,7 @@ server {
 server {
   listen 443;
 
-  server_name pdl.hf c.pdl.hf www.pdl.hf;
+  server_name pompdelux.local c.pompdelux.local www.pompdelux.local;
   root /var/www/pompdelux/web/;
 
   ssl on;
@@ -59,7 +59,7 @@ server {
 server {
   listen 80;
 
-  server_name cdn.pdl.hf static.pompdelux.hf;
+  server_name cdn.pompdelux.local static.pompdelux.local;
   root /var/www/pompdelux/web/;
 
   error_log /var/www/logs/error.log;
@@ -79,7 +79,7 @@ server {
 server {
   listen 443;
 
-  server_name cdn.pdl.hf static.pompdelux.hf;
+  server_name cdn.pompdelux.local static.pompdelux.local;
   root /var/www/pompdelux/web/;
 
   ssl on;
@@ -103,7 +103,7 @@ server {
 server {
   listen 80;
 
-  server_name mya.pompdelux.hf;
+  server_name mya.pompdelux.local;
 
   location /phpmyadmin {
     root /usr/share/;

tools/docker/start-docker-containers.sh

@@ -1,22 +1,27 @@
-#!/bin/sh
+#!/bin/bash
 
-IMAGE='hf/pompdelux-web:wheezy'
+IMAGE='bellcom/pompdelux-web:wheezy'
 NAME="pompdelux-web"
 
 echo "Stopping existing containers"
 RUNNING_CONTAINERS=$(docker ps -q)
 
-if [[ command -v mailcatcher >/dev/null 2>&1 ]]; then
-  MAILCATCHER_IS_RUNNING=`netstat -tna | grep 1025 | wc -l`
-  if [[ $MAILCATCHER_IS_RUNNING == 0 ]]; then
-    mailcatcher --smtp-ip 172.17.42.1
-  fi
-fi
+# if [[ command -v mailcatcher >/dev/null 2>&1 ]]; then
+#   MAILCATCHER_IS_RUNNING=`netstat -tna | grep 1025 | wc -l`
+#   if [[ $MAILCATCHER_IS_RUNNING == 0 ]]; then
+#     mailcatcher --smtp-ip 172.17.42.1
+#   fi
+# fi
 
 if [[ -n $RUNNING_CONTAINERS ]]; then
   docker stop $RUNNING_CONTAINERS
 fi
 
+# Create logs directory
+if [[ ! -d ../../../../logs ]]; then
+    mkdir ../../../../logs
+fi
+
 # Not the prettiest way, but the output changes to much to cut -c is usefull, and using word delimiters in grep also fails if the name is used in the image name
 CONTAINER_EXIST=`docker ps -a | grep -c " $NAME "`
 if [[ $CONTAINER_EXIST > 0 ]]; then
@@ -26,6 +31,6 @@ if [[ $CONTAINER_EXIST > 0 ]]; then
 else
   # -d detach
   echo "Starting new docker with name $NAME"
-  docker run -d -h pompdelux-db -v $(pwd)/mysql/wheezy:/var/lib/mysql --name pompdelux-db hf/pompdelux-db:wheezy
-  docker run -d -h pompdelux-web --link pompdelux-db:pompdelux-db -i -t -p 80:80 -p 443:443 -v $(pwd)/www:/var/www -v $(pwd)/nginx:/etc/nginx/sites-enabled/ --name $NAME $IMAGE
+  docker run -d -h pompdelux-db -v $(pwd)/mysql/wheezy:/var/lib/mysql --name pompdelux-db bellcom/pompdelux-db:wheezy
+  docker run -d -h pompdelux-web --link pompdelux-db:pompdelux-db -i -t -p 80:80 -p 443:443 -v $(pwd)/../../:/var/www/pompdelux -v $(pwd)/nginx:/etc/nginx/sites-enabled/ --name $NAME $IMAGE
 fi

tools/docker/web/Dockerfile

@@ -27,7 +27,10 @@ ADD ./add-files/dotdeb.list /etc/apt/sources.list.d/dotdeb.list
 
 RUN apt-get -q -y update;\
   apt-get -q -y upgrade;\
-  apt-get -q -y install ssh ssmtp vim pwgen locales nginx php5-fpm php5-cli php5-curl php5-gd php5-imagick php5-intl php5-mcrypt php5-mysql php5-redis php5-xdebug php5-xsl php-pear php5-dev mercurial redis-tools heirloom-mailx
+  apt-get -q -y install ssh ssmtp vim pwgen locales nginx php5-fpm php5-cli php5-curl php5-gd php5-imagick php5-intl php5-mcrypt php5-mysql php5-redis php5-xdebug php5-xsl php-pear php5-dev mercurial redis-tools heirloom-mailx ruby ruby-dev libsqlite3-dev
+
+# Install Gems
+RUN gem install mailcatcher --no-rdoc --no-ri
 
 # Locales
 RUN sed -i -e 's/# da_DK.UTF-8/da_DK.UTF-8/' /etc/locale.gen;\

tools/docker/web/add-files/server.crt

@@ -1,23 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIJALVRATvC+49DMA0GCSqGSIb3DQEBBQUAMHgxCzAJBgNV
-BAYTAkRLMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxEzARBgNVBAMMCnd3dy5wZGwuaGYxHDAaBgkqhkiG9w0B
-CQEWDWhmQGJlbGxjb20uZGswHhcNMTQxMTE3MTEyNDQyWhcNMTUxMTE3MTEyNDQy
-WjB4MQswCQYDVQQGEwJESzETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwY
-SW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRMwEQYDVQQDDAp3d3cucGRsLmhmMRww
-GgYJKoZIhvcNAQkBFg1oZkBiZWxsY29tLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEArUGnpYl86fI6IAUV23mNZ5CAUOBzZne7KVy83aw9IwFx/y9G
-FfUnH/UMEAJnfBh6B9yarORTObfh80KpGNT2iq9LbF2IzlMo+MU/oHk/lNleTDnj
-kf3k1rx0+1dl8Lla3ETZEjxSEx9ewCzZF+ViJjWEHFbuH2xxh8+w4bLnVeAv9UqG
-+EYehcls6BXBCJc9PWtCmsZ2B5+k5J5QtQMTBwpFt+dEzZ1XK8fZL4koZqvIS8+W
-ti3r806Tc8jWLZUVKHNYhcxloL5kpZ6jDJ0oaAopoyise8XL73zFkoEvzXNAJewd
-LeCEcX/z6RfQnLEGYf50OFT1uzTG+SmPz2VXGQIDAQABo1AwTjAdBgNVHQ4EFgQU
-g8lBuvZQFtnvfr27aYxuPt84KjkwHwYDVR0jBBgwFoAUg8lBuvZQFtnvfr27aYxu
-Pt84KjkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAQ6lRkcZMOo1F
-SS4GR1uNUrDLwfpaHDHkCi+Koz7TdzwguAIRYPJ+pQlnWZjCfFo8YYE1SepvvaWL
-JNiuk4LIlOErzzjNQ2eOwdL9QfsnJTIInyImitWovGHwKdMiPDtQVnt3D45/giBS
-bnWDf5RvwcEgx7cGOqwe6ogoWkThfGKTAvbykrtfVBafRXvmczF4A/hsfB8X2dTu
-QMsGvanUS4eGZbXdKqaaJRjkuOwZJeM1e4O28UbFfPnooWLvnwXpcv6ZV1FneIms
-0BgmkFYeJK/lc2ug7bad3zmzM65CNgd4Wr4AX5v4RKira3F79MfB7Z/Jp/XK4YQO
-+GQxQ2N35A==
+MIID9zCCAt+gAwIBAgIJAOL2ufz6obcaMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYD
+VQQGEwJEQTEQMA4GA1UECAwHS29sZGluZzEQMA4GA1UEBwwHS29sZGluZzEUMBIG
+A1UECgwLQmVsbGNvbSBBcFMxEjAQBgNVBAsMCVVkdmlrbGluZzEWMBQGA1UEAwwN
+TW9ydGVuIE5pc3NlbjEcMBoGCSqGSIb3DQEJARYNbW5AYmVsbGNvbS5kazAeFw0x
+NTA0MTUwNjA5MDNaFw0xNjA0MTQwNjA5MDNaMIGRMQswCQYDVQQGEwJEQTEQMA4G
+A1UECAwHS29sZGluZzEQMA4GA1UEBwwHS29sZGluZzEUMBIGA1UECgwLQmVsbGNv
+bSBBcFMxEjAQBgNVBAsMCVVkdmlrbGluZzEWMBQGA1UEAwwNTW9ydGVuIE5pc3Nl
+bjEcMBoGCSqGSIb3DQEJARYNbW5AYmVsbGNvbS5kazCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMw2YTt032LFQeIwtPgyVFQ7YyCD8bu2QtvqTdVF7IFR
+Qct6hBPzJrbkUGpYDAz57uTpk7ir9oON8gqg/FT5jUg5opwTUqxR7MDr5v3CfRXF
+Biy/JpO7E4IqsNKM1ygQ7TzQ6Fiw0AoLn1rAMjakcAcq6Oos8dZhmwmkbwSAohsH
+2Ja5v+Oeuj4Ah4YGZT1o/t3iTc3eoLAvYQgb8RZNptYWx2990FWUpM3jdBD3oCLC
+SBVgnUjC6MsE2uOTHf7dJSf4UDsIUOZkNPmS889gUlnL41F7vCeZh2CnoLvLPil9
+HuJJnwbzR2H1XCyc803bqmlCTvnILyRkoSSrE8BKxbsCAwEAAaNQME4wHQYDVR0O
+BBYEFDtLrIMAFHdq2+TEikqnyNyTlkqCMB8GA1UdIwQYMBaAFDtLrIMAFHdq2+TE
+ikqnyNyTlkqCMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGZF0eJC
+Y9O2BWibCjgX0aQ9rlncx/fg+kD0CKXEn/utNgKBd4UYUDk0yusYg7rS7tyqLxzM
+GTX+5YvdoYe82QIgXUB4PWz8LF5/nL5Me8c0FnhQxU1UySaKRVxi3a76yDlgI4Xd
+QxEpIHfBimT8obru8+3MEwp3CgZlcyv5WGfTp6/94XM0aLaLLCHK+jAHbWmoSzWJ
+Zhvgot9YNT+YPS+s1rpQNZjYluJbbGP85H3MIQsBAMTW0PowF0Ol4lERqs8Z58dR
+98crqY61JwlsesWoBaK25QORiyCetGNHf9RBKuNkEI3HDQHYBr5tmNXDrLTzyawg
+ZIl/mMvgB4AcGls=
 -----END CERTIFICATE-----

tools/docker/web/add-files/server.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtQaeliXzp8jog
-BRXbeY1nkIBQ4HNmd7spXLzdrD0jAXH/L0YV9Scf9QwQAmd8GHoH3Jqs5FM5t+Hz
-QqkY1PaKr0tsXYjOUyj4xT+geT+U2V5MOeOR/eTWvHT7V2XwuVrcRNkSPFITH17A
-LNkX5WImNYQcVu4fbHGHz7DhsudV4C/1Sob4Rh6FyWzoFcEIlz09a0KaxnYHn6Tk
-nlC1AxMHCkW350TNnVcrx9kviShmq8hLz5a2LevzTpNzyNYtlRUoc1iFzGWgvmSl
-nqMMnShoCimjKKx7xcvvfMWSgS/Nc0Al7B0t4IRxf/PpF9CcsQZh/nQ4VPW7NMb5
-KY/PZVcZAgMBAAECggEATkc9oXMO9vwz+seRaonus338G45tVTx/WV7HDjiFns1G
-Xg9T0RPkS3IBszIC43SDng2z7K10VL2Z3ridgdSmV15/60QPTXkRJ+SmrLBbY7sZ
-+cKl6Q4XWFXpXK3OJwb34FFS6gRK6MzhmF4q77r5r126hLtZ9uSeHshdmHumPYvA
-h13Nj0umzPE/IwN2+7NsSiuBTRzj3SI3BoK8dHz6knbtCbgg0jaMOdZfVr3AWeD7
-FjrZtHCf4JGpXcw6Sa0VfVvKpde41r4R1kRGmP0ixfGL5cM/2+nEnkXqBqCWM53o
-D0l7EnNrvfXupPbZLLJwUGn45We9KE8dGdpIyzY4aQKBgQDWzePJnLUwtzetDEwd
-VSAksC88eZcbu7aBSi5UFmLLG4gu4OPQLUtDAfM+eoTht1+zr8uo2PACZPDPqi2l
-I6xE+poUy/dZM1wffQXzdRq4OGOm9mio1lZC/MGS4Pw92WRGftOKCoYMPlZJ4Sr+
-hNgFIhl76E/9sOcn97LSjEJ70wKBgQDOe+tJuGBN9aXKIJ6nJjUywHQazgvGl7up
-QowK398kvJVfnTK1XM2Noe6IBc9sifiApzzwjO/+iaHkyMec0TLqD4Imb/W9pLVr
-dMyEqduqCLUSPARjT09nIC+Vj7EiimO0xUGase856992GNK+dDjTTH9WNedg3FKo
-dK6epLhp4wKBgQCquHKdT142fLfUYlywR3LHlfvE7cJqeVOBCGsvy6bzVEt1LqoB
-T65scEVaV9f66Vo3nrWX2etPi9hUxCWJBYQqQp5pfv50t7w1DpHHQEBfP/n7vgXK
-gqeGkAptaUExCvGGkdAg+2I0ourDxyD7rqtd0Q8+CpJgx9PAUT6f1ngUnwKBgQCi
-Rv2p2H/HhVGgw3Ysw3h3xIz7LAhRMZrI8YYCXeOPia6TkIXzx1W9BBDlUjusf9qP
-sd/Q5dMP5rcXiTxn4Hn1Pe75qnAldTcnlonNkXkT7vfvtr90FTbAQ6liD6YVEVI/
-Fe/zVfg/O0NKG0Q1bj3iwnIpHQAVPdKwldNO1wIgJQKBgFv1tGe1AQkqZZ8hdAqP
-mLu0UqusgJtCNpnf9ieJ0+/PMvEhAEg8TJerKmsbWWFECEkfMxVAy1UPPj1LM7jw
-mqyF538AmjvWK/UDS/4XNsCp5UCoQ5SCDytyeszJIf1XDXRSkAUFYWdyhrzoVpM/
-z0ZcAnmL4EItR/A+B9KBKZN7
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDMNmE7dN9ixUHi
+MLT4MlRUO2Mgg/G7tkLb6k3VReyBUUHLeoQT8ya25FBqWAwM+e7k6ZO4q/aDjfIK
+oPxU+Y1IOaKcE1KsUezA6+b9wn0VxQYsvyaTuxOCKrDSjNcoEO080OhYsNAKC59a
+wDI2pHAHKujqLPHWYZsJpG8EgKIbB9iWub/jnro+AIeGBmU9aP7d4k3N3qCwL2EI
+G/EWTabWFsdvfdBVlKTN43QQ96AiwkgVYJ1IwujLBNrjkx3+3SUn+FA7CFDmZDT5
+kvPPYFJZy+NRe7wnmYdgp6C7yz4pfR7iSZ8G80dh9VwsnPNN26ppQk75yC8kZKEk
+qxPASsW7AgMBAAECggEBAL+xQD5+q/7cacb4r7fYDr7u7FMmaDErmsEyxRMxSxvs
++dUW0Yqkka/WzAG3WsCHkI/DDs6oZYQCJ7WAfr0JcGze5Vya6t0lHhfOmYuVGLPp
+ua0hVgYQ8vQaPNe4K3PJx9hxxdkTSIZVeKXIipoua5be2bqQrAbwooc/mpLgaMrz
+ORkAUek23NtSr6iSFe3GJPwWuz4p3gWRtQoeQRVMG/So3Dsnn5vXl297SniDcYba
+nmZxXaiOcVODeQ5QtZH9JQR3K6nGrwilYWk7eQP0Ib/9Eo0s9Cylbh/eX21dhMV0
+yMWIuzgVMI5quKxoHFi5leltS8ekH8M7WpcQEIw+0jkCgYEA9iAxmKsIx5yCRetU
+amP9UPu9ZAQBv3RPaPW2snKDKC4dPiRAkNtQInXSmuoZjNKJPt93gLyUdUfTK2vT
+R3+34SUBVRYCnd/tW439uyYoaZdygXu/pY2StyDn1QuKOnvh+Iu2XFY8Ou9DnBCN
+MwSCEvVwgV67zl4lVlE9UjlDAKcCgYEA1Ge4UQ+TsBlUGRnjDV0TdulS2lAispZ/
+OndkwLhicbPzqCVVnQr47iA+LowImYofbAmUwL2vHY1nEp7N5kG/HRi5N9707QQX
+MFB1vW0P0gEtbIdIkqb0DAEYJ+NASRsL3crqS6NNKUme+WTNXu7nb4ysmaGOms+Q
+XjHxJaBqwM0CgYAgsRwFXEp5QReos95tl0Rxek6ot0OIK6nUljajM0SqlJ17wJL2
+6rqVKTNFMm0cYGasfEBCUEoj3dt1vAe/Sn6hICoyJA9K6xB7Bbw7HJFnnR8vhcFp
++wkO3AcPLE47AHN+cQhS8X1kkp1XYHdw3Ftuqz07YdruSWEKOxY7ErIMpwKBgGM2
+n22drQqQiiu/X8MaOsFMcxruW4a3rW4N3s32UmVx/NoJtlfIjEYOYX00g7/UOKEq
+SIVPFMDlD8Qu0VZAV5irt7hVOGqNgpdaveRhUQZy7ljHSCrYOR5yVGotSBXdwEk1
+QwNZn+0tKkirwRIa3ZfJScXpJMdDNNgK0+0TZUnxAoGAVnB26fakEDe+GxlV/ifo
+NRq4xB1aD/7MD17KFkW7BUtshx+9PguDeGDJWCHgYtUTGsBG/LusPztYl91N1Drd
+cocwAv4sEavpYzPciE5RTFK+qt5v01u/nBfwdlshUHI7C5gmT+FmMm+sUfpwOLdT
+NPit+2d+jz4HudRFCXD6494=
 -----END PRIVATE KEY-----

tools/docker/web/add-files/startup-in-container.sh

@@ -4,4 +4,13 @@ service ssh start
 service php5-fpm start
 service nginx start
 
+mailcatcher
+
+
+# Create logs directory
+if [[ ! -d /var/www/logs ]]; then
+    mkdir /var/www/logs
+    chown -R www-data: /var/www/logs
+fi
+
 tail -f /var/log/dmesg

tools/docker/web/build.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --rm -t hf/pompdelux-web:wheezy .
+docker build --rm -t bellcom/pompdelux-web:wheezy .

tools/phantomjs-launch.sh

@@ -1,3 +1,8 @@
 #!/bin/bash
 
-phantomjs --webdriver=172.17.42.1:8643 --ignore-ssl-errors=true
+if ! type phantomjs > /dev/null; then
+    echo "Install from here: http://phantomjs.org/download.html or apt-get install phantomjs"
+    exit 1
+else
+    phantomjs --webdriver=172.17.42.1:8643 --ignore-ssl-errors=true
+fi