discourse_docker.git
8 years agoTweak the Vagrantfile for more CPUs, earlier proxy config
Matt Palmer [Sun, 18 Oct 2015 02:52:30 +0000 (13:52 +1100)]
Tweak the Vagrantfile for more CPUs, earlier proxy config

8 years agoAdjust down the OOM score on PgSQL databases
Matt Palmer [Fri, 16 Oct 2015 11:28:34 +0000 (22:28 +1100)]
Adjust down the OOM score on PgSQL databases

8 years agoOnly check resources on bootstrap / rebuild
Matt Palmer [Mon, 21 Sep 2015 03:47:48 +0000 (13:47 +1000)]
Only check resources on bootstrap / rebuild

There's no reason to make sure there's enough diskspace or memory unless
we're building a container.

8 years agouse docker-gc docker image
Sam Saffron [Wed, 28 Oct 2015 22:11:45 +0000 (09:11 +1100)]
use docker-gc docker image

8 years agoMerge pull request #200 from dandv/patch-1
Régis Hanol [Fri, 16 Oct 2015 12:58:39 +0000 (14:58 +0200)]
Merge pull request #200 from dandv/patch-1

Fix typo

8 years agoMerge pull request #201 from dandv/patch-2
Régis Hanol [Fri, 16 Oct 2015 12:58:16 +0000 (14:58 +0200)]
Merge pull request #201 from dandv/patch-2

Create README.md

8 years agoCreate README.md
Dan Dascalescu [Fri, 16 Oct 2015 12:42:12 +0000 (05:42 -0700)]
Create README.md

8 years agoFix typo
Dan Dascalescu [Fri, 16 Oct 2015 12:41:41 +0000 (05:41 -0700)]
Fix typo

8 years agoMerge pull request #199 from Mooash/master
Sam [Fri, 16 Oct 2015 00:07:24 +0000 (11:07 +1100)]
Merge pull request #199 from Mooash/master

Trust the real_ip header sent form socket connections

8 years agoIf sockets are being used trust the real_ip header sent form connections to it by...
Mooash [Thu, 15 Oct 2015 11:30:53 +0000 (22:30 +1100)]
If sockets are being used trust the real_ip header sent form connections to it by default

8 years agoperms
Sam [Mon, 12 Oct 2015 04:04:29 +0000 (15:04 +1100)]
perms

8 years agoupdate docker gc script
Sam [Sun, 11 Oct 2015 22:52:53 +0000 (09:52 +1100)]
update docker gc script

8 years agooops needed for bootstrap
Sam [Tue, 22 Sep 2015 08:28:09 +0000 (18:28 +1000)]
oops needed for bootstrap

8 years agoupgrade base image
Sam [Tue, 22 Sep 2015 03:41:59 +0000 (13:41 +1000)]
upgrade base image

8 years agofix hash
Sam [Tue, 22 Sep 2015 02:55:06 +0000 (12:55 +1000)]
fix hash

8 years agoupdate node
Sam [Tue, 22 Sep 2015 02:00:55 +0000 (12:00 +1000)]
update node

8 years agoupgrade rubies, get ready for new image
Sam [Tue, 22 Sep 2015 01:56:22 +0000 (11:56 +1000)]
upgrade rubies, get ready for new image

8 years agoUpdate standalone.yml
Jeff Atwood [Mon, 21 Sep 2015 08:25:33 +0000 (01:25 -0700)]
Update standalone.yml

add warning about pound symbol in smtp password

8 years agoDon't wig out when on a 1GB instance with swap
Matt Palmer [Thu, 17 Sep 2015 00:03:13 +0000 (10:03 +1000)]
Don't wig out when on a 1GB instance with swap

8 years agoMerge pull request #189 from mpalmer/memory-test-take-2
Jeff Atwood [Wed, 16 Sep 2015 10:23:21 +0000 (03:23 -0700)]
Merge pull request #189 from mpalmer/memory-test-take-2

Fix memory check to not account for 'free' memory

8 years agoMore adjustments to the launcher resource checks
Matt Palmer [Tue, 15 Sep 2015 23:56:14 +0000 (09:56 +1000)]
More adjustments to the launcher resource checks

* Don't *fail* the install, just warn that the user doesn't have enough to
  be comfortable.  We pause the installation to allow the user to go fix
  their system if they want to, but only if they're running interactively.

* Drop the limits for detecting how much RAM a system has, because a VM with
  1GB of RAM doesn't actually *report* that (kernel memory isn't in `free
  -m`).

8 years agoFix memory check to not account for 'free' memory
Matt Palmer [Mon, 14 Sep 2015 23:12:01 +0000 (09:12 +1000)]
Fix memory check to not account for 'free' memory

Previous, 'clever' check didn't take into account the possibility
of Discourse already running.

8 years agocomment out memory tests
Sam [Mon, 14 Sep 2015 20:17:57 +0000 (06:17 +1000)]
comment out memory tests

8 years agoMerge pull request #188 from mpalmer/vagrantfile
Sam [Mon, 14 Sep 2015 07:23:52 +0000 (17:23 +1000)]
Merge pull request #188 from mpalmer/vagrantfile

Add a basic Vagrantfile for local testing

8 years agoAdd a bit of light documentation for using Vagrant
Matt Palmer [Mon, 14 Sep 2015 05:49:08 +0000 (15:49 +1000)]
Add a bit of light documentation for using Vagrant

8 years agoLink the git repo to the default location for discourse
Matt Palmer [Mon, 14 Sep 2015 05:48:15 +0000 (15:48 +1000)]
Link the git repo to the default location for discourse

8 years agoSet default memory size to our no-swap-needed minimum
Matt Palmer [Mon, 14 Sep 2015 05:45:14 +0000 (15:45 +1000)]
Set default memory size to our no-swap-needed minimum

8 years agoAutomatically install Docker in the recommended fashion
Matt Palmer [Mon, 14 Sep 2015 05:32:51 +0000 (15:32 +1000)]
Automatically install Docker in the recommended fashion

This should be enough to ensure that, if this install method were to
become unavailable in the future, we'd know about it and could alter
our other documentation.

8 years agoMerge pull request #187 from mpalmer/prereq-resources
Sam [Mon, 14 Sep 2015 05:20:21 +0000 (15:20 +1000)]
Merge pull request #187 from mpalmer/prereq-resources

Test that we have enough memory and diskspace before installing

8 years agoAdd a basic Vagrantfile for local testing
Matt Palmer [Mon, 14 Sep 2015 04:18:21 +0000 (14:18 +1000)]
Add a basic Vagrantfile for local testing

It comes in handy when you want to poke around with things; anyone who
tries to use this for production-like deployments should be gently but
firmly dissuaded.

8 years agoTest that we have enough memory and diskspace before installing
Matt Palmer [Mon, 14 Sep 2015 04:12:31 +0000 (14:12 +1000)]
Test that we have enough memory and diskspace before installing

The minimum specs for a Discourse server are a standalone machine with 1GB
of memory + 1GB swap, or 2GB of memory.  To try and catch anyone who's doing
this on a larger machine with lots of other stuff going on, I've checked
"available" memory (used memory minus disk cache) rather than total memory.

8 years agoMerge pull request #179 from Stealthii/bugfix/docker-install-docs
Sam [Mon, 17 Aug 2015 23:43:08 +0000 (09:43 +1000)]
Merge pull request #179 from Stealthii/bugfix/docker-install-docs

Clarify Ubuntu-specific docker install instructions

8 years agoMerge pull request #178 from Blaisorblade/topic/yaml-docker-args-expose
Sam [Mon, 17 Aug 2015 23:35:23 +0000 (09:35 +1000)]
Merge pull request #178 from Blaisorblade/topic/yaml-docker-args-expose

Add docker_args support to YAML configs (fix #175)

8 years agoClarify Ubuntu-specific docker install instructions
Daniel Porter [Mon, 17 Aug 2015 14:18:54 +0000 (15:18 +0100)]
Clarify Ubuntu-specific docker install instructions

8 years agoupdate bundler
Sam [Mon, 17 Aug 2015 07:24:06 +0000 (17:24 +1000)]
update bundler

8 years agoAdd eslint to test image
Robin Ward [Thu, 13 Aug 2015 18:49:16 +0000 (14:49 -0400)]
Add eslint to test image

8 years agoShow docker_args also in other YAML files
Paolo G. Giarrusso [Thu, 13 Aug 2015 13:49:27 +0000 (15:49 +0200)]
Show docker_args also in other YAML files

Arguably redundant but useful.

8 years agoAdd docker_args to YAML syntax (fix #175)
Paolo G. Giarrusso [Thu, 13 Aug 2015 13:48:39 +0000 (15:48 +0200)]
Add docker_args to YAML syntax (fix #175)

Also update main sample YAML.

8 years agoMerge pull request #177 from krichprollsch/patch-1
Sam [Thu, 30 Jul 2015 03:04:29 +0000 (13:04 +1000)]
Merge pull request #177 from krichprollsch/patch-1

Update install docker instructions

8 years agoUse docker-gc by spotify for cleanup
Sam [Thu, 30 Jul 2015 02:50:31 +0000 (12:50 +1000)]
Use docker-gc by spotify for cleanup

8 years agoUpdate install docker instructions
Pierre Tachoire [Wed, 29 Jul 2015 19:55:03 +0000 (21:55 +0200)]
Update install docker instructions

According with new apt repos description [[1]](https://blog.docker.com/2015/07/new-apt-and-yum-repos/)

8 years agoMerge pull request #176 from Kovah/master
Régis Hanol [Tue, 28 Jul 2015 13:52:40 +0000 (15:52 +0200)]
Merge pull request #176 from Kovah/master

Removing the mailtest command from the launcher reference

8 years agoRemoving the mailtest command from the launcher reference
Kovah [Tue, 28 Jul 2015 13:46:44 +0000 (15:46 +0200)]
Removing the mailtest command from the launcher reference

The mailtest command was removed in [579ce85](https://github.com/discourse/discourse_docker/commit/579ce85d19f1b95151126957988122feb6cbbd8b)., should be removed from the `launcher` reference in the README.md file

8 years agoMerge pull request #173 from Blaisorblade/patch-1
Sam [Tue, 28 Jul 2015 00:09:50 +0000 (10:09 +1000)]
Merge pull request #173 from Blaisorblade/patch-1

Fix #168: handle empty command gracefully

8 years agoFix #168: handle empty command gracefully
Paolo G. Giarrusso [Mon, 27 Jul 2015 22:26:46 +0000 (00:26 +0200)]
Fix #168: handle empty command gracefully

8 years agoMerge pull request #172 from riking/patch-1
Jeff Atwood [Wed, 22 Jul 2015 02:28:45 +0000 (19:28 -0700)]
Merge pull request #172 from riking/patch-1

Abort if domain is not configured

8 years agoAbort if domain is not configured
Kane York [Wed, 22 Jul 2015 02:22:54 +0000 (19:22 -0700)]
Abort if domain is not configured

https://meta.discourse.org/t/stupid-discourse-examples-com-set-up-issue/31260/9?u=riking

8 years agocorrect template to remove old socket
Sam [Tue, 7 Jul 2015 23:58:21 +0000 (09:58 +1000)]
correct template to remove old socket

8 years agoMerge pull request #167 from riking/cloudflare
Jeff Atwood [Mon, 6 Jul 2015 23:55:30 +0000 (16:55 -0700)]
Merge pull request #167 from riking/cloudflare

Add cloudflare.template.yml

8 years agoMerge pull request #171 from riking/patch-3
Jeff Atwood [Mon, 6 Jul 2015 18:29:57 +0000 (11:29 -0700)]
Merge pull request #171 from riking/patch-3

Rip out mailtest

8 years agoRip out mailtest
Kane York [Mon, 6 Jul 2015 17:49:42 +0000 (10:49 -0700)]
Rip out mailtest

8 years agoadd note about multiple error messages
Jeff Atwood [Sat, 4 Jul 2015 23:20:02 +0000 (16:20 -0700)]
add note about multiple error messages

8 years agoadd better failed to bootstrap message
Jeff Atwood [Sat, 4 Jul 2015 23:18:24 +0000 (16:18 -0700)]
add better failed to bootstrap message

8 years agoMerge pull request #170 from riking/patch-1
Jeff Atwood [Fri, 3 Jul 2015 01:00:24 +0000 (18:00 -0700)]
Merge pull request #170 from riking/patch-1

Remove old sockets on bootstrap

8 years agoRemove old sockets on bootstrap
Kane York [Fri, 3 Jul 2015 00:12:50 +0000 (17:12 -0700)]
Remove old sockets on bootstrap

8 years agoclean up indenting
Sam [Fri, 26 Jun 2015 03:44:50 +0000 (13:44 +1000)]
clean up indenting

8 years agoallow nginx logs to be read by the web
Sam [Fri, 26 Jun 2015 02:33:50 +0000 (12:33 +1000)]
allow nginx logs to be read by the web

9 years agoMerge pull request #166 from seekingalpha/docker_host
Sam [Sat, 6 Jun 2015 07:15:59 +0000 (17:15 +1000)]
Merge pull request #166 from seekingalpha/docker_host

Detect and use the DOCKER_HOST environment variable

9 years agoDetect and use the DOCKER_HOST environment variable
Amir Yalon [Wed, 3 Jun 2015 08:25:15 +0000 (11:25 +0300)]
Detect and use the DOCKER_HOST environment variable

For working with docker-machine, for example.

9 years agoVersion 3 of cloudflare.template.yml
riking [Tue, 2 Jun 2015 20:51:20 +0000 (13:51 -0700)]
Version 3 of cloudflare.template.yml

9 years agobump version
Sam [Fri, 29 May 2015 08:18:43 +0000 (18:18 +1000)]
bump version

9 years agodependencies are wrong way around
Sam [Fri, 29 May 2015 05:02:49 +0000 (15:02 +1000)]
dependencies are wrong way around

9 years agofix dependencies
Sam [Fri, 29 May 2015 04:58:08 +0000 (14:58 +1000)]
fix dependencies

9 years agobump version
Sam [Fri, 29 May 2015 04:51:34 +0000 (14:51 +1000)]
bump version

9 years agoremove old unused docker images, update version
Sam [Fri, 29 May 2015 04:51:02 +0000 (14:51 +1000)]
remove old unused docker images, update version

9 years agoUpdate base image
Sam [Fri, 29 May 2015 04:50:21 +0000 (14:50 +1000)]
Update base image

* include all image_optim dependencies
* upgrade jemalloc

9 years agotake stronger action in launcher when people are using an unsupported filesystem
Sam [Fri, 29 May 2015 00:39:28 +0000 (10:39 +1000)]
take stronger action in launcher when people are using an unsupported filesystem

9 years agoMerge pull request #163 from jamielinux/fix-dhparam
Sam [Sat, 23 May 2015 07:18:04 +0000 (17:18 +1000)]
Merge pull request #163 from jamielinux/fix-dhparam

Do not ignore errors when generating DH parameters

9 years agoInvert logic to avoid problems with exit status
Jamie Nguyen [Fri, 22 May 2015 06:50:44 +0000 (07:50 +0100)]
Invert logic to avoid problems with exit status

9 years agoDo not ignore errors when generating DH parameters
Jamie Nguyen [Fri, 22 May 2015 06:05:51 +0000 (07:05 +0100)]
Do not ignore errors when generating DH parameters

9 years agoMerge pull request #161 from jamielinux/update-ciphers
Sam [Fri, 22 May 2015 01:47:55 +0000 (11:47 +1000)]
Merge pull request #161 from jamielinux/update-ciphers

Update cipher list

9 years agoAdd missing semi-colon
Jamie Nguyen [Thu, 21 May 2015 16:49:54 +0000 (17:49 +0100)]
Add missing semi-colon

9 years agoUpdate cipher list
Jamie Nguyen [Thu, 21 May 2015 16:25:49 +0000 (17:25 +0100)]
Update cipher list

9 years agoMerge pull request #160 from riking/patch-4
Sam [Thu, 21 May 2015 02:11:16 +0000 (12:11 +1000)]
Merge pull request #160 from riking/patch-4

Generate unique DHE parameters during bootstrap

9 years agoGenerate unique DHE parameters on first bootstrap
riking [Thu, 21 May 2015 01:40:25 +0000 (18:40 -0700)]
Generate unique DHE parameters on first bootstrap

9 years agoFEATURE: a lot more params for customising pg installs
Sam [Thu, 14 May 2015 06:49:01 +0000 (16:49 +1000)]
FEATURE: a lot more params for customising pg installs

9 years agoFIX: bad SQL in bootstrap
Sam [Thu, 14 May 2015 06:48:42 +0000 (16:48 +1000)]
FIX: bad SQL in bootstrap

9 years agoMerge pull request #157 from ericschoolzilla/master
Sam [Tue, 12 May 2015 06:21:23 +0000 (16:21 +1000)]
Merge pull request #157 from ericschoolzilla/master

Added config name check to prevent docker name errors after build.

9 years agoit should be global
Sam [Tue, 12 May 2015 05:12:13 +0000 (15:12 +1000)]
it should be global

9 years agofastly rule to preserve ip
Sam [Tue, 12 May 2015 05:05:42 +0000 (15:05 +1000)]
fastly rule to preserve ip

9 years agoAdded config name check to prevent docker name errors after build.
Eric Hoxworth [Fri, 8 May 2015 15:04:30 +0000 (10:04 -0500)]
Added config name check to prevent docker name errors after build.

9 years agoMerge pull request #156 from rosshays/master
Régis Hanol [Wed, 6 May 2015 21:28:26 +0000 (23:28 +0200)]
Merge pull request #156 from rosshays/master

Fixing a syntax error with one of the exception handlers in mailtest

9 years agoFixing a syntax error with one of the exception handlers
Ross Hays [Wed, 6 May 2015 19:58:42 +0000 (15:58 -0400)]
Fixing a syntax error with one of the exception handlers

9 years agoMerge pull request #155 from spicyj/patch-1
Sam [Wed, 6 May 2015 02:35:01 +0000 (12:35 +1000)]
Merge pull request #155 from spicyj/patch-1

Fix INSTALL instructions link in README

9 years agoFix INSTALL instructions link in README
Ben Alpert [Wed, 6 May 2015 00:33:01 +0000 (17:33 -0700)]
Fix INSTALL instructions link in README

9 years agoMerge pull request #154 from hayeah/fix-rails-arguments-expansion
Sam [Mon, 4 May 2015 00:05:41 +0000 (10:05 +1000)]
Merge pull request #154 from hayeah/fix-rails-arguments-expansion

Fix rails wrapper's arguments expansion problem.

9 years agoFix rails wrapper's arguments expansion problem.
Howard Yeh [Sat, 2 May 2015 13:35:46 +0000 (21:35 +0800)]
Fix rails wrapper's arguments expansion problem.

"$@" expands to multiple words, and breaks `[` if there are multiple
arguments. Use "$*" == "console" instead, since this expands all the
arguments to a single word, which is what we want instead.

9 years agoMerge pull request #148 from rata/master
Sam [Tue, 28 Apr 2015 00:36:27 +0000 (10:36 +1000)]
Merge pull request #148 from rata/master

Revert templates/web.sssl.template.yml: Disable spdy header compression

9 years agoRevert "templates/web.sssl.template.yml: Disable spdy header compression"
Rodrigo Campos [Mon, 27 Apr 2015 14:26:22 +0000 (11:26 -0300)]
Revert "templates/web.sssl.template.yml: Disable spdy header compression"

This reverts commit c0ed494c3acf1acf629379f33f413d7660183855. It was late and I
misread the info here:

https://github.com/18F/tls-standards/issues/24

The first comment clearly states that the server *can* compress spdy header, as
the attack is on request headers (not responses). And modern browsers disable
compression on requests (or chrome, maybe even smarter tricks in newer
versions). In fact, Chrome 21 and Firefox 15 switched off SPDY header
compression[1] and the requirements page on discourse:

https://github.com/discourse/discourse#requirements

shows newer browsers than those are needed. So it seems safe to enable spdy
header compression on the server.

[1]: https://www.imperialviolet.org/2012/09/21/crime.html

9 years agoMerge pull request #147 from rata/master
Sam [Tue, 21 Apr 2015 14:04:52 +0000 (00:04 +1000)]
Merge pull request #147 from rata/master

templates/web.sssl.template.yml: Disable spdy header compression

9 years agotemplates/web.sssl.template.yml: Enable TLS session resumption
rata [Tue, 21 Apr 2015 00:57:08 +0000 (21:57 -0300)]
templates/web.sssl.template.yml: Enable TLS session resumption

This is totally safe to enable, as the cache default is 5m, and should reduce CPU usage on the server

9 years agotemplates/web.sssl.template.yml: Disable spdy header compression
rata [Tue, 21 Apr 2015 00:43:45 +0000 (21:43 -0300)]
templates/web.sssl.template.yml: Disable spdy header compression

As explained here:

https://github.com/18F/tls-standards/issues/24

We shouldn't use spdy header compression with spdy 1.3 (the one packaged with nginx).So, just disable it.

9 years agoversion bump
Sam [Thu, 16 Apr 2015 02:54:27 +0000 (12:54 +1000)]
version bump

9 years agoupdate ruby 2.2 to latest
Sam [Thu, 16 Apr 2015 01:51:14 +0000 (11:51 +1000)]
update ruby 2.2 to latest

9 years agoversion bump
Sam [Thu, 16 Apr 2015 01:47:03 +0000 (11:47 +1000)]
version bump

9 years agoupdate ruby
Sam [Thu, 16 Apr 2015 01:30:57 +0000 (11:30 +1000)]
update ruby

9 years agoFIX: broken nginx log file rotation
Sam [Thu, 16 Apr 2015 01:30:37 +0000 (11:30 +1000)]
FIX: broken nginx log file rotation

9 years agoupdate pngout to latest version
Régis Hanol [Wed, 15 Apr 2015 09:30:39 +0000 (11:30 +0200)]
update pngout to latest version

9 years agoMerge pull request #144 from tgxworld/fix_readme
Sam [Thu, 9 Apr 2015 01:51:53 +0000 (11:51 +1000)]
Merge pull request #144 from tgxworld/fix_readme

Update README.

9 years agoUpdate README.
Guo Xiang Tan [Thu, 9 Apr 2015 01:40:22 +0000 (09:40 +0800)]
Update README.

Follow up to https://github.com/discourse/discourse_docker/commit/8b4382c7aa3a92440f292d7abdd4bce5b29ee405.