allow *.canvas.docker in the docker-compose dev environment

The leading dot is nginx syntax for allowing both `canvas.docker` and `*.canvas.docker`

Also pull in libxmlsec1-dev, for SAML.

Change-Id: I4281252053b7d890b08c06c30ad17f5b11670579
Reviewed-on: https://gerrit.instructure.com/52720
Tested-by: Jenkins
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
This commit is contained in:
Brian Palmer 2015-04-23 09:00:44 -06:00
parent dc142ca33f
commit 86c2fbe3a2
2 changed files with 2 additions and 1 deletions

View File

@ -34,7 +34,7 @@ web:
- kinesis
environment:
RACK_ENV: development
VIRTUAL_HOST: canvas.docker
VIRTUAL_HOST: .canvas.docker
jobs:
build: ./docker-compose

View File

@ -8,6 +8,7 @@ RUN apt-get update -qq \
locales \
nodejs \
postgresql-client \
libxmlsec1-dev \
&& rm -rf /var/lib/apt/lists/*
# Ensure UTF-8 locale