Commit Graph

102 Commits

Author SHA1 Message Date
Luke Peterson a9111de172 Remove double php5-mysql inclusion 2015-07-23 16:59:45 +10:00
Richard Harvey 9109039cef Merge pull request #16 from ngineered/stable
Stable
2015-07-17 14:58:01 +01:00
Richard Harvey 6b03a0dd73 Merge pull request #15 from ngineered/mainline
Mainline
2015-07-17 14:57:40 +01:00
Ric Harvey de389ffcba Merge branch 'master' into stable 2015-07-17 13:55:30 +00:00
Ric Harvey a98ba847f0 Merge branch 'master' into mainline 2015-07-17 13:55:12 +00:00
Ric Harvey 9ae8061a07 Fix issue #14 2015-07-17 13:54:57 +00:00
Ric Harvey 64cc346449 Merge branch 'master' into stable 2015-07-15 11:17:11 +00:00
Ric Harvey a4318f72eb Merge branch 'master' into mainline 2015-07-15 11:16:51 +00:00
Ric Harvey 941cdffc8f remove duplicate default nginx config 2015-07-15 11:02:24 +00:00
Ric Harvey 1b13ce62c2 changes in user for nginx and php-fpm 2015-07-15 10:47:08 +00:00
Ric Harvey ffc9ee6f33 No stdout on supervisor for the moment 2015-07-15 10:18:49 +00:00
Ric Harvey c9e5181ab8 fix supervisord 2015-07-15 10:05:36 +00:00
Ric Harvey b1ca04a38b fix supervisord 2015-07-15 10:04:44 +00:00
Ric Harvey d4509afd5f updated supervisord location in start.sh script 2015-07-15 10:02:14 +00:00
Ric Harvey ab4dc68fc2 Using stable branch of nginx 2015-07-15 09:02:42 +00:00
Ric Harvey 195e6999c2 Adding autoremove 2015-07-15 08:49:52 +00:00
Ric Harvey 10cdaa81cb Updating Dockerfile for smaller image and nginx PPA 2015-07-15 08:24:32 +00:00
Ric Harvey eb99e527c9 removing imagemagic 2015-07-14 11:34:27 +00:00
Ric Harvey 10c06a0933 Removing the need for wget 2015-07-14 10:59:31 +00:00
Ric Harvey c4d382151d Tidy up dockerfile 2015-07-14 10:37:55 +00:00
Ric Harvey 8bc2d86334 image shrink 2015-07-13 12:13:18 +00:00
Ric Harvey 29366ef97a reducing debian image size (hopefully) 2015-07-13 11:18:49 +01:00
Ric Harvey a94ed8b750 fixing a typo whilst using vim! 2015-07-10 15:06:17 +00:00
Ric Harvey 07ee70e194 Fixed install on debian 2015-07-10 14:46:49 +00:00
Ric Harvey ee8dcb4357 Tweaking for debian 2015-07-10 15:04:42 +01:00
Ric Harvey a026b88901 Building debian branch 2015-07-10 14:49:20 +01:00
Ric Harvey 2803363c8d Working on logging 2015-07-10 11:17:07 +01:00
Ric Harvey 179849b556 Fixing priorities in supervisord to reduce start up errors 2015-07-09 23:24:36 +01:00
Ric Harvey 016df2237e Tightening up supervisord config 2015-07-09 23:16:45 +01:00
Ric Harvey 7ffff83d79 Tweak to volume creation 2015-07-09 23:09:45 +01:00
Ric Harvey b5c0d64ca2 tweaks to docker file to add volume support 2015-07-09 22:18:29 +01:00
Richard Harvey 14bee7b1bc Merge pull request #13 from artburkart/touchup-readme
Small fix in README
2015-07-05 20:54:50 +01:00
Arthur Burkart fdf884fd15 Small fix in README 2015-07-04 11:26:53 -04:00
Ric Harvey 1c1c77889f Swapping beta to mainline 2015-06-25 13:30:45 +00:00
Richard Harvey 80c0eea98f Merge pull request #12 from ngineered/stable
Stable
2015-06-25 14:29:11 +01:00
Ric Harvey 0e829ddfae Merge branch 'master' into stable 2015-06-25 13:17:19 +00:00
Ric Harvey 96d30c6a51 Adding info for pull and push 2015-06-25 13:15:30 +00:00
Ric Harvey a3c11bb067 Working Git scripts 2015-06-25 13:05:43 +00:00
Ric Harvey d34afc56e0 fixing syntax in pull script 2015-06-25 11:07:16 +00:00
Ric Harvey b525568b72 Beta test of pull and push scripts 2015-06-25 10:23:06 +00:00
Ric Harvey c2b1980e0d Merge branch 'master' into stable 2015-06-24 20:07:03 +01:00
Ric Harvey b13602c7e7 Bump to 1.9.2 2015-06-24 20:06:45 +01:00
Ric Harvey 3cc4575ac2 Merge branch 'master' into stable 2015-06-24 20:04:35 +01:00
Ric Harvey dc045722f5 Adding postgreSQL and mongoDB drivers 2015-06-24 20:03:09 +01:00
Richard Harvey f679cc8d98 Merge pull request #10 from levidurfee/master
Changed deplyname to deployname
2015-06-24 19:56:19 +01:00
Levi 631f0690b4 Changed deplyname to deployname 2015-06-21 13:24:00 -04:00
Ric Harvey 479ccc084f Merge branch 'master' into stable 2015-06-01 12:37:14 +01:00
Ric Harvey 97bdfe5925 Updating mainline to version 1.9.1 2015-06-01 12:36:07 +01:00
Ric Harvey a370bd6b48 Updating readme 2015-05-22 10:53:33 +01:00
Ric Harvey 774c511185 maiking mainline the master branch 2015-05-22 10:51:48 +01:00