Commit Graph

20 Commits

Author SHA1 Message Date
snipe d40129bdae Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	Dockerfile
2016-05-16 20:55:08 -07:00
snipe bf9aba3f20 Merge pull request #2007 from samepage-labs/docker_ubuntu_trusty
Docker image requires ubuntu trusty, not latest
2016-05-10 00:08:33 -07:00
snipe 7e554a3c59 Merge branch 'develop' 2016-05-09 16:03:49 -07:00
Brady Wetherington f16122070a Pin down Docker version to ubuntu:wily 2016-05-05 12:41:52 -07:00
Petr Baloun 4803bc71ec Docker image requires ubuntu trusty, not latest 2016-05-04 11:45:53 +02:00
Petr Baloun d1bcee0dfa Moved ssl keys to /var/lib/snipeit 2016-04-04 09:31:45 +02:00
Petr Baloun e4dfb188fa Created data volume, redirected data directories there 2016-04-04 09:31:45 +02:00
Petr Baloun 8bbaf2e52f Added mysql client 2016-03-31 13:03:26 +02:00
Bjarne K 31c4a63ec0 Added copy for apache SSL file and commands to enable SSL in apache 2015-11-20 11:55:57 +01:00
Brady Wetherington 6d365157e7 Changed to using Entrypoint instead of CMD for better start/stop 2015-11-12 21:50:58 -08:00
Brady Wetherington 50170dd774 Improve start script, add entrypoint script 2015-11-12 20:05:39 -08:00
Brady Wetherington 22ea008bb4 New documentation on Docker method of running Snipe-IT. New environment
variables available to customize how Snipe-IT ought to work under
Docker. Locale, timezone, and custom-URL support. Documentation pushes
users to move more towards 'env-files' rather than environment variables.

Fixes #1020
2015-09-21 16:44:17 -07:00
Brady Wetherington 49a20c75ed Fix for #1052 - hopefully make it less brittle in future as well. 2015-09-21 13:15:26 -07:00
Ira W. Snyder 3f08258bf0 Add LDAP support to Docker image
This adds LDAP support to the Docker image. All parameters are specified
using environment variables named following the convention in the
configuration files themselves.
2015-08-28 09:10:28 -07:00
Ira W. Snyder f7ce7060eb Allow Docker users to set the server URL
This change allows Docker users to set the server URL by setting the
SERVER_URL environment variable. This is done in the same way as the
database and mail settings.
2015-08-28 09:03:06 -07:00
Ira W. Snyder 1927f131aa Fix broken Docker build
The Dockerfile now includes the php5-curl package, which is needed to
satisfy a missing dependency.

The docker/app_start.patch was updated to match changes to the source
code.
2015-08-26 14:09:03 -07:00
Chris Leathley 7380affe9c Added php5-gd as it's required for the QR Codes, Bit of code cleanup and removal of the toolbar by default 2015-02-25 17:46:28 +08:00
Brady Wetherington c0ce1939cb Make Docker respect email configuration passed via environment. 2015-02-17 21:13:40 -08:00
Brady Wetherington 9be159ea15 Cleaned up the docker images to shrink it; expanded docker documentation 2015-02-17 16:22:03 -08:00
Brady Wetherington c9b51bface Docker kinda-sorta working, and documentation 2015-02-16 21:27:23 -08:00