discourse_docker.git
7 years agoMore work to make automatic build easier
Rafael dos Santos Silva [Wed, 1 Feb 2017 02:41:39 +0000 (00:41 -0200)]
More work to make automatic build easier

7 years agoMove everything to a complete base image
Rafael dos Santos Silva [Tue, 31 Jan 2017 15:21:00 +0000 (13:21 -0200)]
Move everything to a complete base image

7 years agoMerge pull request #325 from phaldan/master
Sam [Tue, 17 Jan 2017 22:06:59 +0000 (17:06 -0500)]
Merge pull request #325 from phaldan/master

Fix usage of docker_ip variable with multiple ips

7 years agoBump acme.sh.
Guo Xiang Tan [Tue, 10 Jan 2017 02:51:30 +0000 (10:51 +0800)]
Bump acme.sh.

7 years agoFix usage of docker_ip variable with multiple ips
Philipp Daniels [Wed, 4 Jan 2017 11:21:56 +0000 (12:21 +0100)]
Fix usage of docker_ip variable with multiple ips

My setup contains a default Rancher node + agent on the same host. This leads to multiple ip in the docker_ip variable. Fix by adding double quotes around docker_ip variable

7 years agoBumps ImageMagick from 6.9.6-7 to 6.9.7-0
Rafael dos Santos Silva [Wed, 28 Dec 2016 19:31:30 +0000 (17:31 -0200)]
Bumps ImageMagick from 6.9.6-7 to 6.9.7-0

7 years agoFixes ngx_brotli compilation
Rafael dos Santos Silva [Wed, 28 Dec 2016 18:54:31 +0000 (16:54 -0200)]
Fixes ngx_brotli compilation

7 years agoBumps image version to 1.3.10
Rafael dos Santos Silva [Wed, 28 Dec 2016 18:29:13 +0000 (16:29 -0200)]
Bumps image version to 1.3.10

7 years agoEnables brotli compressed assets for everyone
Rafael dos Santos Silva [Wed, 28 Dec 2016 18:04:30 +0000 (16:04 -0200)]
Enables brotli compressed assets for everyone

7 years agoEveryone goes back to Jemalloc 3.6.0
Rafael dos Santos Silva [Wed, 28 Dec 2016 18:03:57 +0000 (16:03 -0200)]
Everyone goes back to Jemalloc 3.6.0

7 years agoMove --docker-args to the end so it gets priority
Rafael dos Santos Silva [Tue, 27 Dec 2016 20:12:03 +0000 (18:12 -0200)]
Move --docker-args to the end so it gets priority

7 years agoUse a 2048 dhparam again
Rafael dos Santos Silva [Thu, 22 Dec 2016 16:54:21 +0000 (14:54 -0200)]
Use a 2048 dhparam again

4096 takes 16x as long, we can't allow several hours installs

https://meta.discourse.org/t/prime-calculation-for-openssl-just-goes-on/54653/5?u=falco

7 years agoadd mailcatcher
Sam [Tue, 13 Dec 2016 03:57:24 +0000 (14:57 +1100)]
add mailcatcher

7 years agoMerge pull request #317 from ibnesayeed/master
Sam [Tue, 13 Dec 2016 03:55:09 +0000 (14:55 +1100)]
Merge pull request #317 from ibnesayeed/master

Adding dev dependencies in the docker image

7 years agosome more db tuning
Sam [Tue, 13 Dec 2016 03:54:14 +0000 (14:54 +1100)]
some more db tuning

7 years agoAdding dev dependencies in the docker image
Sawood Alam [Mon, 12 Dec 2016 23:46:37 +0000 (18:46 -0500)]
Adding dev dependencies in the docker image

7 years agoneed to migrate test as well
Sam [Mon, 12 Dec 2016 06:45:04 +0000 (17:45 +1100)]
need to migrate test as well

7 years agocorrect issues with dev image
Sam [Mon, 12 Dec 2016 06:36:15 +0000 (17:36 +1100)]
correct issues with dev image

7 years agoRename `ALLOCATOR` -> `RUBY_ALLOCATOR`.
Guo Xiang Tan [Fri, 9 Dec 2016 02:28:52 +0000 (10:28 +0800)]
Rename `ALLOCATOR` -> `RUBY_ALLOCATOR`.

7 years agoMerge pull request #316 from discourse/jemalloc-regression
Guo Xiang Tan [Fri, 9 Dec 2016 02:28:09 +0000 (03:28 +0100)]
Merge pull request #316 from discourse/jemalloc-regression

Memory Allocation Fiesta

7 years agotcmalloc 2.5 is the default allocator, but this is now configurable
Rafael dos Santos Silva [Wed, 7 Dec 2016 22:57:47 +0000 (20:57 -0200)]
tcmalloc 2.5 is the default allocator, but this is now configurable

7 years agoAdds tcmalloc and lockless allocators to base image
Rafael dos Santos Silva [Wed, 7 Dec 2016 22:29:38 +0000 (20:29 -0200)]
Adds tcmalloc and lockless allocators to base image

7 years agoMerge pull request #315 from robbyoconnor/fix-hsts-for-aplus
Sam [Wed, 7 Dec 2016 07:04:46 +0000 (18:04 +1100)]
Merge pull request #315 from robbyoconnor/fix-hsts-for-aplus

Some HTTPS improvements to achieve A+ on Qualsys SSL Labs

7 years agoBumps version to 1.3.9
Rafael dos Santos Silva [Wed, 7 Dec 2016 00:52:33 +0000 (22:52 -0200)]
Bumps version to 1.3.9

7 years agoUpdates ImageMagick from 6.9.6-5 to 6.9.6-7
Rafael dos Santos Silva [Wed, 7 Dec 2016 00:40:28 +0000 (22:40 -0200)]
Updates ImageMagick from 6.9.6-5 to 6.9.6-7

7 years agoRollback jemalloc from 4.3.1 to 3.6.0
Rafael dos Santos Silva [Wed, 7 Dec 2016 00:39:41 +0000 (22:39 -0200)]
Rollback jemalloc from 4.3.1 to 3.6.0

7 years agoSome HTTPS improvements to achieve A+ on Qualsys SSL Labs
Robert O'Connor [Tue, 6 Dec 2016 22:32:40 +0000 (17:32 -0500)]
Some HTTPS improvements to achieve A+ on Qualsys SSL Labs

- Make HSTS max-age longer for A+ on qualsys SSL labs
- dhparams 4096 bits vs 2048

8 years agoBumps laucher to use docker image version 1.3.8
Rafael dos Santos Silva [Wed, 23 Nov 2016 02:57:38 +0000 (00:57 -0200)]
Bumps laucher to use docker image version 1.3.8

8 years agoMerge pull request #311 from discourse/image-update
Rafael dos Santos Silva [Tue, 22 Nov 2016 23:25:33 +0000 (21:25 -0200)]
Merge pull request #311 from discourse/image-update

Image update

8 years agoRemove minor PostgreSQL version pinning
Rafael dos Santos Silva [Mon, 21 Nov 2016 18:19:28 +0000 (16:19 -0200)]
Remove minor PostgreSQL version pinning

8 years agoUpdates ruby from 2.3.2 to 2.3.3
Rafael dos Santos Silva [Mon, 21 Nov 2016 14:48:01 +0000 (12:48 -0200)]
Updates ruby from 2.3.2 to 2.3.3

8 years agoFixes ruby-build with jemalloc
Rafael dos Santos Silva [Thu, 17 Nov 2016 15:49:24 +0000 (13:49 -0200)]
Fixes ruby-build with jemalloc

8 years agoUpdates ImageMagick from 6.9.6-2 tp 6.9.6-5
Rafael dos Santos Silva [Thu, 17 Nov 2016 03:26:51 +0000 (01:26 -0200)]
Updates ImageMagick from 6.9.6-2 tp 6.9.6-5

8 years agoAdds jemalloc directly to ruby
Rafael dos Santos Silva [Thu, 17 Nov 2016 03:12:53 +0000 (01:12 -0200)]
Adds jemalloc directly to ruby

8 years agoBumps images to 1.3.8
Rafael dos Santos Silva [Thu, 17 Nov 2016 00:49:19 +0000 (22:49 -0200)]
Bumps images to 1.3.8

8 years agoUpdates pngquant from 2.6.0 to 2.8.0
Rafael dos Santos Silva [Thu, 17 Nov 2016 00:48:57 +0000 (22:48 -0200)]
Updates pngquant from 2.6.0 to 2.8.0

8 years agoUpdates nginx from 1.11.3 to 1.11.6
Rafael dos Santos Silva [Wed, 16 Nov 2016 20:04:11 +0000 (18:04 -0200)]
Updates nginx from 1.11.3 to 1.11.6

8 years agoUpdates pngcrush from 1.8.8 to 1.8.10
Rafael dos Santos Silva [Wed, 16 Nov 2016 19:29:48 +0000 (17:29 -0200)]
Updates pngcrush from 1.8.8 to 1.8.10

8 years agoUpdates nodejs from 4.x to 6.x new LTS version
Rafael dos Santos Silva [Wed, 16 Nov 2016 19:27:48 +0000 (17:27 -0200)]
Updates nodejs from 4.x to 6.x new LTS version

8 years agoUpdates jemalloc from 3.6.0 to 4.3.1
Rafael dos Santos Silva [Wed, 16 Nov 2016 19:18:39 +0000 (17:18 -0200)]
Updates jemalloc from 3.6.0 to 4.3.1

8 years agoUpdates ruby to 2.3.2
Rafael dos Santos Silva [Wed, 16 Nov 2016 19:17:08 +0000 (17:17 -0200)]
Updates ruby to 2.3.2

8 years agoMerge pull request #303 from theikkila/master
Matt Palmer [Sun, 30 Oct 2016 00:37:48 +0000 (11:37 +1100)]
Merge pull request #303 from theikkila/master

Fix physical core calculation

8 years agoBumps laucher to use docker image version 1.3.7
Rafael dos Santos Silva [Fri, 28 Oct 2016 19:34:03 +0000 (17:34 -0200)]
Bumps laucher to use docker image version 1.3.7

8 years agoInstall docker-squash in the PATH
Rafael dos Santos Silva [Fri, 28 Oct 2016 19:31:06 +0000 (17:31 -0200)]
Install docker-squash in the PATH

8 years agoFix physical core calculation
Teemu Heikkilä [Fri, 28 Oct 2016 18:37:46 +0000 (21:37 +0300)]
Fix physical core calculation

8 years agoFix new docker_squash install
Rafael dos Santos Silva [Thu, 27 Oct 2016 15:56:34 +0000 (13:56 -0200)]
Fix new docker_squash install

8 years agoBumps PostgreSQL version
Rafael dos Santos Silva [Thu, 27 Oct 2016 15:56:11 +0000 (13:56 -0200)]
Bumps PostgreSQL version

8 years agoMerge pull request #297 from simongareste/master
Sam [Mon, 24 Oct 2016 20:56:31 +0000 (07:56 +1100)]
Merge pull request #297 from simongareste/master

Fix OS X not knowing the free bash command

8 years agoMerge pull request #301 from xfalcox/dev-image-improvements
Sam [Mon, 24 Oct 2016 20:55:26 +0000 (07:55 +1100)]
Merge pull request #301 from xfalcox/dev-image-improvements

Dev image improvements

8 years agobuild.rb improvements
Rafael dos Santos Silva [Fri, 21 Oct 2016 01:32:01 +0000 (23:32 -0200)]
build.rb improvements

8 years agoconserve memory
Sam [Thu, 20 Oct 2016 23:29:49 +0000 (10:29 +1100)]
conserve memory

8 years agoCalculate layers to keep only when necessary
Rafael dos Santos Silva [Wed, 19 Oct 2016 20:40:29 +0000 (18:40 -0200)]
Calculate layers to keep only when necessary

8 years agoAdds Makefile functions to build.rb
Rafael dos Santos Silva [Wed, 19 Oct 2016 20:31:18 +0000 (18:31 -0200)]
Adds Makefile functions to build.rb

8 years agoUse new docker squash
Rafael dos Santos Silva [Tue, 18 Oct 2016 23:01:46 +0000 (21:01 -0200)]
Use new docker squash

8 years agoIgnore ngx_brotli deprecations for now
Rafael dos Santos Silva [Tue, 18 Oct 2016 22:59:08 +0000 (20:59 -0200)]
Ignore ngx_brotli deprecations for now

8 years agoIgnore ngx_brotli deprecations for now
Rafael dos Santos Silva [Tue, 18 Oct 2016 22:58:59 +0000 (20:58 -0200)]
Ignore ngx_brotli deprecations for now

8 years agoMove user creation from base to discourse and dev
Rafael dos Santos Silva [Tue, 18 Oct 2016 19:11:35 +0000 (17:11 -0200)]
Move user creation from base to discourse and dev

8 years agoNeeded version bumps
Rafael dos Santos Silva [Tue, 18 Oct 2016 18:41:03 +0000 (16:41 -0200)]
Needed version bumps

8 years agoFix core and memory numbers availability on Mac OS X
Simon Gareste [Tue, 11 Oct 2016 09:27:16 +0000 (11:27 +0200)]
Fix core and memory numbers availability on Mac OS X

8 years agoFix OS X not knowing the free bash command
Simon Gareste [Tue, 11 Oct 2016 08:12:31 +0000 (10:12 +0200)]
Fix OS X not knowing the free bash command

8 years agoMerge pull request #296 from phaldan/master
Sam [Mon, 10 Oct 2016 01:32:30 +0000 (12:32 +1100)]
Merge pull request #296 from phaldan/master

Fix empty arguments on launcher rerun after git pull

8 years agoFix empty arguments on launcher rerun after git pull
Philipp Daniels [Sat, 8 Oct 2016 23:57:54 +0000 (01:57 +0200)]
Fix empty arguments on launcher rerun after git pull

Variable $@ cannot be used to get arguments for launcher rerun, because the usage of the shift (line 44) command has removed all entries from $@. Instead $BASH_ARGV can be used, but $BASH_ARGV contains arguments in reversed order.

8 years agoUse new Cloudflare URLs for IP address lists
Matt Palmer [Wed, 28 Sep 2016 15:03:22 +0000 (01:03 +1000)]
Use new Cloudflare URLs for IP address lists

8 years agoUse same postgres sleep as elsewhere
Jared Reisinger [Wed, 21 Sep 2016 22:40:37 +0000 (15:40 -0700)]
Use same postgres sleep as elsewhere

8 years agoUpdate README with new squash info
Jared Reisinger [Wed, 21 Sep 2016 17:21:34 +0000 (10:21 -0700)]
Update README with new squash info

8 years agoClean up subshell escapes
Jared Reisinger [Wed, 21 Sep 2016 17:09:15 +0000 (10:09 -0700)]
Clean up subshell escapes

8 years agoImprove optional/default squashing.
Jared Reisinger [Wed, 21 Sep 2016 16:34:57 +0000 (09:34 -0700)]
Improve optional/default squashing.

I've verified that:
  - OSX/Darwin-specific docker-squash,
  - with gnu-tar 1.29 (>=1.27) in the path as "tar",
  - and run as root,

actually works.  As such, using docker-squash is now the default
behavior (consistent with the previous behavior), but you can opt out of
it by prefix your `make` command with the `SQUASH=NO` environment
variable:
    SQUASH=NO make all

Also note that rather than running the _entire_ make with "sudo", it's
now used specifically for the docker-squash call only, so that the
various make commands aren't running more privileged than they really
need to.

8 years agoImprove image building (primarily for discourse_dev)
Jared Reisinger [Tue, 20 Sep 2016 22:02:31 +0000 (15:02 -0700)]
Improve image building (primarily for discourse_dev)

Move "discourse" user and "/var/www" directory creation into base image
so that discourse_dev can build from base image directly instead of
requiring the overhead of the full discourse image.

Remove discourse_fast_switch dependency from discourse_dev, and remove
the ruby 2.2/2.0 logic, as Discourse already appears to require 2.3.0 or
greater.

Remove discourse_dev's independent `postgres.template.yml` and
`redis.template.yml` files, and instead derive them from the top-level
templates directory.  This ensures that the discourse_dev image is
always up-to-date with the discourse main image.

Add password-less "sudo" permissions for the "discourse" user in the
discourse_dev image.  This simplifies (fixes) the "bundle install"
command (and others) as implemented by discourse/bin/docker utilities.

Add image/Makefile so that images can be built even on machines without
Ruby installed.  Logic is replicated from `image/build.rb`, and should
result in equivalent images.  (Perhaps build.rb should be removed?)

Add automation in Makefile to ensure that all Dockerfiles are updated to
match the version number in the Makefile.  (This includes the `/VERSION`
file written into the base image.)

Add image/README.md to describe the images and process.

Update ImageMagick to 6.9.5-9 in the base Dockerfile because 6.9.5-8 is
no longer available. (Perhaps this dependency should be vendored.)

Fix base "boot" failure caused by missing log files on a new instance
(in `base/runit-1.d-00-fix-var-logs`).  Before chowning the log files,
"touch" them to ensure they exist.  This failure previously prevented
the discourse_dev `ensure-database` script from running, which made
development use of discourse_dev very difficult.

Update to version 1.3.7.  (Driven by IMAGE_VERSION in the Makefile.
Mostly, this is to ensure that the next official build of the images
will be *at least* 1.3.7, superseding any previous versions.)

8 years agoBump acme.sh version.
Guo Xiang Tan [Mon, 19 Sep 2016 09:02:40 +0000 (17:02 +0800)]
Bump acme.sh version.

8 years agoSupport runtime labels in YAML definitions
Matt Palmer [Tue, 13 Sep 2016 02:00:33 +0000 (12:00 +1000)]
Support runtime labels in YAML definitions

8 years agoMerge pull request #290 from pfaffman/make-swap-le-2
Jeff Atwood [Mon, 12 Sep 2016 22:44:03 +0000 (15:44 -0700)]
Merge pull request #290 from pfaffman/make-swap-le-2

FIX: make swap when mem is <= (not <) 2GB

8 years agoEDIT: Fix up messages about memory and swap
Jay Pfaffman [Mon, 12 Sep 2016 22:11:19 +0000 (15:11 -0700)]
EDIT: Fix up messages about memory and swap

8 years agoFIX: make swap when mem is <= (not <) 2GB
Jay Pfaffman [Mon, 12 Sep 2016 22:07:34 +0000 (15:07 -0700)]
FIX: make swap when mem is <= (not <) 2GB

8 years agoMerge pull request #288 from pfaffman/fix-mem-and-install-docker
Jeff Atwood [Sat, 10 Sep 2016 04:41:17 +0000 (21:41 -0700)]
Merge pull request #288 from pfaffman/fix-mem-and-install-docker

Fix mem and install docker

8 years agoMerge pull request #286 from pfaffman/make-memory-tests-work
Jeff Atwood [Fri, 9 Sep 2016 21:55:48 +0000 (14:55 -0700)]
Merge pull request #286 from pfaffman/make-memory-tests-work

Make memory tests work

8 years agoallow exit to work
Jay Pfaffman [Tue, 6 Sep 2016 23:41:51 +0000 (16:41 -0700)]
allow exit to work

8 years agoremoved errant echo
Jay Pfaffman [Tue, 6 Sep 2016 23:21:14 +0000 (16:21 -0700)]
removed errant echo

8 years agoInstall Docker if it's missing
Jay Pfaffman [Tue, 6 Sep 2016 22:17:05 +0000 (22:17 +0000)]
Install Docker if it's missing

8 years agoinstall docker if it's missing
Jay Pfaffman [Tue, 6 Sep 2016 21:18:28 +0000 (21:18 +0000)]
install docker if it's missing

8 years agoFix code that tests for RAM and Swap size
Jay Pfaffman [Tue, 6 Sep 2016 20:36:04 +0000 (20:36 +0000)]
Fix code that tests for RAM and Swap size

Works on DO .5, 1, 2, 4 GB

8 years agoCorrect API key env var
Matt Palmer [Thu, 1 Sep 2016 02:44:23 +0000 (12:44 +1000)]
Correct API key env var

8 years agoDon't update pups in mail-receiver
Matt Palmer [Thu, 1 Sep 2016 01:01:41 +0000 (11:01 +1000)]
Don't update pups in mail-receiver

8 years agoWe'll need MAIL_DOMAIN, too, for mail-receiver
Matt Palmer [Wed, 31 Aug 2016 05:31:19 +0000 (15:31 +1000)]
We'll need MAIL_DOMAIN, too, for mail-receiver

8 years agobase image update
Sam [Thu, 1 Sep 2016 00:18:32 +0000 (10:18 +1000)]
base image update

8 years agoAdd a mail-receiver sample template
Matt Palmer [Wed, 31 Aug 2016 04:56:53 +0000 (14:56 +1000)]
Add a mail-receiver sample template

You can guess where this is going...

8 years agoFIX: Don't force a cert issue everytime.
Guo Xiang Tan [Mon, 29 Aug 2016 21:17:46 +0000 (05:17 +0800)]
FIX: Don't force a cert issue everytime.

8 years agoupgrade image to latest mainline
Sam [Mon, 29 Aug 2016 08:09:22 +0000 (18:09 +1000)]
upgrade image to latest mainline

8 years agoOpps.
Guo Xiang Tan [Mon, 29 Aug 2016 07:23:29 +0000 (15:23 +0800)]
Opps.

8 years agoBoot up nginx as standalone server instead of using netcat.
Guo Xiang Tan [Mon, 29 Aug 2016 06:09:28 +0000 (14:09 +0800)]
Boot up nginx as standalone server instead of using netcat.

8 years agoMerge pull request #280 from gschlager/phpbb3
Sam [Fri, 26 Aug 2016 06:05:34 +0000 (23:05 -0700)]
Merge pull request #280 from gschlager/phpbb3

Improve template for phpBB3 importer

8 years agoImprove template for phpBB3 importer
Gerhard Schlager [Fri, 19 Aug 2016 21:46:18 +0000 (23:46 +0200)]
Improve template for phpBB3 importer

- Exit immediately if the database import or any
  other command fails
- Store SHA26 checksum of database dump and
  automatically recreate database if the checksum
  changed since the last database import

8 years agoMerge pull request #275 from lbergnehr/lbergnehr-patch-1
Sam [Tue, 9 Aug 2016 00:20:08 +0000 (17:20 -0700)]
Merge pull request #275 from lbergnehr/lbergnehr-patch-1

Segregate postgres upgrade instructions on version

8 years agoSegregate postgres upgrade instructions on version
Leo Bergnéhr [Mon, 8 Aug 2016 10:54:01 +0000 (12:54 +0200)]
Segregate postgres upgrade instructions on version

The previous instructions always instructed the reader to undo the base image and postgres template in the container configuration. If the upgrade were done from 9.3, that might be confusing as the `base_image` property had never been altered in a previous step.

8 years agoFIX: Make sure we're checking against a string.
Guo Xiang Tan [Thu, 4 Aug 2016 10:09:56 +0000 (18:09 +0800)]
FIX: Make sure we're checking against a string.

8 years agoFEATURE: Allow templates to be nested.
Guo Xiang Tan [Thu, 4 Aug 2016 09:46:56 +0000 (17:46 +0800)]
FEATURE: Allow templates to be nested.

8 years agoBump acme.sh to 2.3.4.
Guo Xiang Tan [Wed, 3 Aug 2016 05:15:22 +0000 (13:15 +0800)]
Bump acme.sh to 2.3.4.

8 years agoEscape slashes from smtp_password
Matt Palmer [Sun, 24 Jul 2016 23:25:17 +0000 (09:25 +1000)]
Escape slashes from smtp_password

Makes sed a whole lot happier about life.

8 years agoMerge pull request #269 from palant/master
Sam [Tue, 19 Jul 2016 03:40:24 +0000 (13:40 +1000)]
Merge pull request #269 from palant/master

Fixes #268 - Improve description of launcher enter command

8 years agoAdd config options to skip assignment of a mac address.
Guo Xiang Tan [Fri, 15 Jul 2016 07:22:15 +0000 (15:22 +0800)]
Add config options to skip assignment of a mac address.

8 years agoFixes #268 - Improve description of launcher enter command
Wladimir Palant [Mon, 11 Jul 2016 07:27:12 +0000 (09:27 +0200)]
Fixes #268 - Improve description of launcher enter command