Commit Graph

9584 Commits

Author SHA1 Message Date
Tianon Gravi 64be51f6f5 Merge pull request #87 from infosiftr/php-ini
Add php.ini usage
2014-11-05 09:26:55 -07:00
Tianon Gravi ce5295eff6 Merge pull request #91 from infosiftr/httpd
Add httpd docs
2014-11-05 09:23:44 -07:00
Joe Ferguson 8e367edd88 Add httpd docs 2014-11-05 08:22:49 -08:00
Tianon Gravi d9832fa16d Run update.sh 2014-11-04 15:45:27 -07:00
Tianon Gravi 8e416cb401 Cut mono short desc down to less than 100 2014-11-04 15:41:31 -07:00
Joe Ferguson e2782b8942 Add maven docs 2014-11-04 11:32:59 -08:00
Joe Ferguson e47b8e28c4 Add php.ini usage 2014-11-03 10:48:46 -08:00
Tianon Gravi bbf2658d2b Run update.sh 2014-11-03 10:37:27 -07:00
Tianon Gravi 768a5b2067 Merge pull request #89 from infosiftr/mono
Add mono docs
2014-11-03 09:08:08 -08:00
Joe Ferguson 7413e5cdba Add mono docs 2014-11-03 09:01:33 -08:00
Tianon Gravi fb5d8ee028 Run update.sh 2014-10-31 15:28:26 -06:00
root 6b37808f4a edited license information
Conflicts:
	php-zendserver/license.md
2014-10-31 15:22:08 -06:00
yosifkit ef66c422f7 Merge pull request #77 from pmcgrath/Issue24
Fixed two issues in the 'Start a Go instance in your app' section
2014-10-27 13:15:52 -07:00
Tianon Gravi 488873205d Run update.sh 2014-10-27 13:40:19 -06:00
Tianon Gravi 3057520a66 Merge pull request #85 from infosiftr/tomcat
Add tomcat documentation
2014-10-27 13:37:30 -06:00
Tianon Gravi 8a96c383a1 Run update.sh 2014-10-26 03:47:33 -06:00
Joe Ferguson 8e31eb93a0 Add tomcat documentation 2014-10-24 09:21:10 -07:00
yosifkit 6ae4b7c1fa Merge pull request #84 from infosiftr/fix-utf8-push
Fix spurious vimdiff showing up with identical files
2014-10-23 13:59:45 -07:00
Tianon Gravi f486c61ca6 Fix spurious vimdiff showing up with identical files 2014-10-23 14:09:24 -06:00
Tianon Gravi fbddfc0198 Convert newlines to Unix (and end all content files with a single newline) 2014-10-23 14:02:55 -06:00
Tianon Gravi 9ca64b616b Run update.sh 2014-10-23 13:42:01 -06:00
Tianon Gravi 14c4ff7363 Merge pull request #78 from zendtech/master
Created php-zendserver
2014-10-23 13:40:33 -06:00
root 0480292a23 Reorganized for update.sh 2014-10-23 21:39:47 +03:00
root 9277dd4e30 Merge branch 'master' of github.com:zendtech/docs 2014-10-23 21:29:30 +03:00
root 3f51e9ec3f Reorganized for update.sh 2014-10-23 21:24:31 +03:00
pmcgrath 186aaa9f73 Added extra qualification regarding when running the image with no arguments 2014-10-22 23:36:52 +01:00
pmcgrath eb17ddc9d2 Merge branch 'master' into Issue24 2014-10-22 23:30:47 +01:00
yosifkit 7439290c2a Merge pull request #83 from infosiftr/dockerfile
Add a basic Dockerfile and fix some minor issues in push.pl
2014-10-22 14:04:46 -07:00
pmcgrath 07e1184847 Merge branch 'master' into Issue24
Merged some commits from upstream master so I can push commit with
updated golang content.md and re-generated README.md
2014-10-22 20:43:35 +01:00
dror-g d651e1b660 Update content.md 2014-10-22 14:55:52 +03:00
dror-g 1e337ae596 Update content.md 2014-10-22 14:55:28 +03:00
Tianon Gravi 1a7ef62ffb Add a basic Dockerfile and fix some minor issues in push.pl 2014-10-21 22:29:49 -06:00
Tianon Gravi 9a13965512 Merge pull request #82 from infosiftr/tw80
Mostly tw=80, also a few dockerfile links from update.sh
2014-10-21 20:25:50 -06:00
Joe Ferguson c920ff0075 Mostly tw=80, also a few dockerfile links from update.sh 2014-10-21 15:34:30 -07:00
Tianon Gravi bbdd30b7be Merge pull request #80 from infosiftr/run-update
Run update.sh for new goodness
2014-10-21 16:30:24 -06:00
Dror G fc17124631 Updated docs to reflect ZS version tags 2014-10-21 11:12:46 +03:00
pmcgrath 7b579e75ad Merge branch 'master' into Issue24
Merged whitespace removal commit from upstream master, didn't think i
should rebase branch commits as already pushed commits to my forked
branch so they are public, i am new to pull requests
2014-10-20 22:13:44 +01:00
Joe Ferguson 2f8bf5c74c Run update.sh for new goodness 2014-10-20 13:50:37 -07:00
pmcgrath bd44be5fbd Revert "Restored the CMD instruction to the Dockerfile and removed the CMD instruction explanation, this is a bit of a simplification but is a simplier explanation for a newbie"
This reverts commit 9e53ea71fa.
2014-10-20 21:21:40 +01:00
Tianon Gravi efbf65ded5 Fix whitespace 2014-10-20 10:28:40 -06:00
Dror G 682bd9f7cf Updated README 2014-10-20 18:31:17 +03:00
Dror G 8967e04971 Updated README 2014-10-20 18:29:48 +03:00
Dror G 1c1acf1d86 Zend initial commit 2014-10-20 18:19:20 +03:00
pmcgrath 9e53ea71fa Restored the CMD instruction to the Dockerfile and removed the CMD instruction explanation, this is a bit of a simplification but is a simplier explanation for a newbie 2014-10-19 12:24:53 +01:00
pmcgrath 78f95032a1 Restored comma as suggested by the code style guide, thanks tianan 2014-10-19 12:08:58 +01:00
pmcgrath 459625e038 Restored comma as suggested by the code style guide, thanks tianan 2014-10-19 12:05:00 +01:00
pmcgrath da75635e26 Fixed two issues in the 'Start a Go instance in your app' section and added some content on the CMD instruction. Issue 24 @ https://github.com/docker-library/golang 2014-10-17 23:50:40 +01:00
yosifkit 90fbea85d5 Merge pull request #76 from infosiftr/crate
Add crate, allow custom user-feedback section
2014-10-16 16:30:40 -06:00
Joe Ferguson cdfa39c420 Add crate +logo, allow custom user-feedback section 2014-10-16 16:28:28 -06:00
yosifkit e8955d0790 Merge pull request #75 from infosiftr/add-manifest-links
Add a sentence with a link to the manifest file for reach repo
2014-10-16 15:41:37 -06:00