discourse_docker.git
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

8 years agomore permission fixes for anacron, keep in base image as well
Sam [Thu, 7 Jul 2016 01:08:20 +0000 (11:08 +1000)]
more permission fixes for anacron, keep in base image as well

8 years agoMerge pull request #267 from watchmanmonitoring/yesthatallen-clarify-steps
Sam [Mon, 4 Jul 2016 07:34:16 +0000 (17:34 +1000)]
Merge pull request #267 from watchmanmonitoring/yesthatallen-clarify-steps

clarify steps for completing the upgrade

8 years agoclarify steps for completing the upgrade
Allen Hancock [Sat, 2 Jul 2016 22:26:57 +0000 (17:26 -0500)]
clarify steps for completing the upgrade

8 years agoMerge pull request #266 from gschlager/phpbb3
Sam [Fri, 1 Jul 2016 00:17:48 +0000 (10:17 +1000)]
Merge pull request #266 from gschlager/phpbb3

Fix engine substitution in phpBB3 importer template

8 years agoFix engine substitution in phpBB3 importer template
Gerhard Schlager [Thu, 30 Jun 2016 20:24:49 +0000 (22:24 +0200)]
Fix engine substitution in phpBB3 importer template

8 years agoimprove permission fix
Sam [Wed, 29 Jun 2016 23:54:48 +0000 (09:54 +1000)]
improve permission fix

8 years agofix permission
Sam [Wed, 29 Jun 2016 23:50:22 +0000 (09:50 +1000)]
fix permission

8 years agoMerge pull request #262 from gschlager/phpbb3
Jeff Atwood [Mon, 27 Jun 2016 11:49:01 +0000 (04:49 -0700)]
Merge pull request #262 from gschlager/phpbb3

Upgrade phpBB3 importer template to work with Ubuntu 16.04

8 years agotweak perms
Sam [Tue, 21 Jun 2016 08:31:39 +0000 (18:31 +1000)]
tweak perms

8 years agofix permissions on the log folder on boot
Sam [Tue, 21 Jun 2016 08:28:18 +0000 (18:28 +1000)]
fix permissions on the log folder on boot

8 years agobump image version
Sam [Wed, 8 Jun 2016 21:15:54 +0000 (07:15 +1000)]
bump image version

8 years agobump version
Sam [Wed, 8 Jun 2016 00:33:31 +0000 (10:33 +1000)]
bump version

8 years agoshift enable brotli to boot, it is more correct there
Sam [Tue, 7 Jun 2016 08:24:17 +0000 (18:24 +1000)]
shift enable brotli to boot, it is more correct there

8 years agocorrect bash command so it does not fail
Sam [Tue, 7 Jun 2016 08:12:32 +0000 (18:12 +1000)]
correct bash command so it does not fail

8 years agomake template smart enough to enable brotli if needed
Sam [Tue, 7 Jun 2016 08:06:56 +0000 (18:06 +1000)]
make template smart enough to enable brotli if needed

8 years agomisses a spot
Sam [Tue, 7 Jun 2016 07:00:03 +0000 (17:00 +1000)]
misses a spot

8 years agomove nginx binary into place
Sam [Tue, 7 Jun 2016 06:26:36 +0000 (16:26 +1000)]
move nginx binary into place

8 years agoNew base image
Sam [Tue, 7 Jun 2016 06:13:02 +0000 (16:13 +1000)]
New base image

- add brotli support to nginx
- update imagemagick
- update phantomjs to safe version

8 years agoadd quotes around SMTP_PASSWORD
Jeff Atwood [Sat, 4 Jun 2016 22:46:49 +0000 (15:46 -0700)]
add quotes around SMTP_PASSWORD

8 years agoshould be rebuild
Sam [Sat, 4 Jun 2016 01:57:12 +0000 (11:57 +1000)]
should be rebuild

8 years agoMerge pull request #261 from fefrei/patch-3
Sam [Thu, 26 May 2016 23:40:17 +0000 (09:40 +1000)]
Merge pull request #261 from fefrei/patch-3

Fixed paths in the postgres upgrade instructions

8 years agoUpgrade phpBB3 importer template to work with Ubuntu 16.04
Gerhard Schlager [Wed, 25 May 2016 20:28:40 +0000 (22:28 +0200)]
Upgrade phpBB3 importer template to work with Ubuntu 16.04

8 years agoFixed paths in the postgres upgrade instructions
Felix Freiberger [Thu, 26 May 2016 10:01:00 +0000 (12:01 +0200)]
Fixed paths in the postgres upgrade instructions

8 years agocorrect error conditions
Sam [Thu, 26 May 2016 07:28:39 +0000 (17:28 +1000)]
correct error conditions

8 years agoImprove rebuild experience, don't fail after upgrading db
Sam [Thu, 26 May 2016 07:07:13 +0000 (17:07 +1000)]
Improve rebuild experience, don't fail after upgrading db

8 years agostop binding redis to 127.0.0.1
Sam [Thu, 26 May 2016 03:21:15 +0000 (13:21 +1000)]
stop binding redis to 127.0.0.1

8 years agono need to change base image
Sam [Wed, 25 May 2016 10:43:35 +0000 (20:43 +1000)]
no need to change base image

8 years agoremove uneeded env vars
Sam [Wed, 25 May 2016 04:06:57 +0000 (14:06 +1000)]
remove uneeded env vars

8 years agoMerge branch '1.3.2'
Sam [Wed, 25 May 2016 04:02:24 +0000 (14:02 +1000)]
Merge branch '1.3.2'

8 years agobump up method cache
Sam [Tue, 24 May 2016 08:22:43 +0000 (18:22 +1000)]
bump up method cache

8 years agogif is built in
Sam [Mon, 23 May 2016 10:26:39 +0000 (20:26 +1000)]
gif is built in

8 years agoUpdate Let's Encrypt template to latest API.
Guo Xiang Tan [Mon, 23 May 2016 05:28:02 +0000 (13:28 +0800)]
Update Let's Encrypt template to latest API.

8 years agobump version
Sam [Mon, 23 May 2016 09:00:56 +0000 (19:00 +1000)]
bump version

8 years agobump version
Sam [Mon, 23 May 2016 09:00:36 +0000 (19:00 +1000)]
bump version

8 years agocorrect and validate image magick install
Sam [Mon, 23 May 2016 08:58:15 +0000 (18:58 +1000)]
correct and validate image magick install

8 years agoCtrl+C based on Twitter poll..
Jeff Atwood [Mon, 23 May 2016 08:13:24 +0000 (01:13 -0700)]
Ctrl+C based on Twitter poll..

https://twitter.com/codinghorror/status/734294838925885440

8 years agolatest rubygems has problems
Sam [Mon, 23 May 2016 06:35:45 +0000 (16:35 +1000)]
latest rubygems has problems

https://github.com/bundler/bundler/issues/4602

8 years agobump version to new image
Sam [Mon, 23 May 2016 05:10:27 +0000 (15:10 +1000)]
bump version to new image

8 years agoimage magic updated again
Sam [Mon, 23 May 2016 03:47:41 +0000 (13:47 +1000)]
image magic updated again

8 years agobump image, shave off some more bytes
Sam [Mon, 23 May 2016 03:02:39 +0000 (13:02 +1000)]
bump image, shave off some more bytes

8 years agoslim down image, upgrade image magick and libpng
Sam [Fri, 20 May 2016 08:13:37 +0000 (18:13 +1000)]
slim down image, upgrade image magick and libpng

8 years agowe need a rebuild at the end
Sam [Fri, 20 May 2016 04:57:27 +0000 (14:57 +1000)]
we need a rebuild at the end

8 years agoupdate instructions for ... just in case
Sam [Fri, 20 May 2016 04:13:19 +0000 (14:13 +1000)]
update instructions for ... just in case

8 years agofix up client tools as well
Sam [Fri, 20 May 2016 03:02:11 +0000 (13:02 +1000)]
fix up client tools as well

8 years agotry to force port in template
Sam [Tue, 17 May 2016 13:06:12 +0000 (23:06 +1000)]
try to force port in template

8 years agotry to get template to work
Sam [Tue, 17 May 2016 12:52:20 +0000 (22:52 +1000)]
try to get template to work

8 years agoimprove template
Sam [Tue, 17 May 2016 12:17:23 +0000 (22:17 +1000)]
improve template

8 years agobump version in a few spots
Sam [Tue, 17 May 2016 07:06:37 +0000 (17:06 +1000)]
bump version in a few spots

8 years agoupgrade image and version stuff
Sam [Tue, 17 May 2016 07:02:34 +0000 (17:02 +1000)]
upgrade image and version stuff

8 years agoMerge branch 'upgrade_everyone_to_postgres_9.5' of https://github.com/tgxworld/discou...
Sam [Tue, 17 May 2016 04:48:24 +0000 (14:48 +1000)]
Merge branch 'upgrade_everyone_to_postgres_9.5' of https://github.com/tgxworld/discourse_docker into tgxworld-upgrade_everyone_to_postgres_9.5

8 years agoUpgrade base image to Ubuntu 16.04.
Guo Xiang Tan [Mon, 16 May 2016 06:32:06 +0000 (14:32 +0800)]
Upgrade base image to Ubuntu 16.04.

8 years agowe require 2GB of swap now
Jeff Atwood [Mon, 16 May 2016 22:43:29 +0000 (15:43 -0700)]
we require 2GB of swap now

8 years agoadd SMTP port selection, smarter mailgun handling
Jeff Atwood [Mon, 16 May 2016 10:27:43 +0000 (03:27 -0700)]
add SMTP port selection, smarter mailgun handling

8 years agoBump Ruby version to 2.3.1.
Guo Xiang Tan [Mon, 16 May 2016 02:25:28 +0000 (10:25 +0800)]
Bump Ruby version to 2.3.1.

8 years agoUpdate PostgreSQL to 9.5 in base image.
Guo Xiang Tan [Mon, 16 May 2016 04:13:54 +0000 (12:13 +0800)]
Update PostgreSQL to 9.5 in base image.

8 years agoremove root warning on swapfile create, since we require root at start now
Jeff Atwood [Wed, 11 May 2016 23:34:50 +0000 (16:34 -0700)]
remove root warning on swapfile create, since we require root at start now

8 years agoadd root check since it's required
Jeff Atwood [Tue, 10 May 2016 22:20:39 +0000 (15:20 -0700)]
add root check since it's required

8 years agosudo command redundant on swapfile create
Jeff Atwood [Tue, 10 May 2016 09:10:06 +0000 (02:10 -0700)]
sudo command redundant on swapfile create

8 years agoMerge pull request #253 from mjtko/fix/cve-2016-3714-updates
Régis Hanol [Fri, 6 May 2016 17:38:26 +0000 (19:38 +0200)]
Merge pull request #253 from mjtko/fix/cve-2016-3714-updates

Update ImageMagick security patch for CVE-2016–3714

8 years agoUpdate ImageMagick security patch for CVE-2016–3714 to latest recommendation
Mark Titorenko [Fri, 6 May 2016 09:00:55 +0000 (10:00 +0100)]
Update ImageMagick security patch for CVE-2016–3714 to latest recommendation

8 years agobug: skip_prereqs vs skip_prereq
Jeff Atwood [Wed, 4 May 2016 17:58:10 +0000 (10:58 -0700)]
bug: skip_prereqs vs skip_prereq

8 years agoadd comment
Sam [Tue, 3 May 2016 23:33:53 +0000 (09:33 +1000)]
add comment

8 years agoapply image magick security patch
Sam [Tue, 3 May 2016 23:30:43 +0000 (09:30 +1000)]
apply image magick security patch