DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/docker
History
snipe bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop 
# Conflicts:
#	.all-contributorsrc
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/ImportsController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Requests/ItemImportRequest.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/version.php
#	docker/startup.sh
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
2019-03-20 02:17:02 -07:00
..
000-default-2.4.conf Alpine linux docker image (#6645) 2019-01-30 14:45:36 -08:00
000-default.conf Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
001-default-ssl.conf Fix path to snipeit-ssl.crt (#2428) 2016-08-16 13:03:55 -07:00
develop.sh Fixes to Dockerfile, updated docker/develop.sh for new options. 2016-05-14 16:46:53 -07:00
docker.env Add DB port number to docker 2018-07-18 19:10:06 -07:00
entrypoint_alpine.sh docker: Fix upgrades (#6680) 2019-02-13 20:49:36 -08:00
README.md Change README to point to new documentation site 2016-07-26 13:56:40 -07:00
startup.sh Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
supervisor-exit-event-listener Run Laravel schedule in docker image using supervisord (#6606) 2019-03-07 12:42:00 -08:00
supervisord.conf Run Laravel schedule in docker image using supervisord (#6606) 2019-03-07 12:42:00 -08:00

README.md

See https://snipe-it.readme.io/docs/docker for Docker information