DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 18:14:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-03-07 11:31:38 +00:00
parent 21ad7f549d cbe07ad23b
commit 855d922a3e
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v6.3.2', 'app_version' => 'v6.3.2',
'full_app_version' => 'v6.3.2 - build 12834-g9a5c1b812', 'full_app_version' => 'v6.3.2 - build 12875-g21ad7f549',
'build_version' => '12834', 'build_version' => '12875',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g9a5c1b812', 'hash_version' => 'g21ad7f549',
'full_hash' => 'v6.3.2-160-g9a5c1b812', 'full_hash' => 'v6.3.2-39-g21ad7f549',
'branch' => 'master', 'branch' => 'develop',
); );

7
docker/startup.sh
View file

@ -17,16 +17,23 @@ else
fi fi
# create data directories # create data directories
# Note: Keep in sync with expected directories by the app
# https://github.com/snipe/snipe-it/blob/master/app/Console/Commands/RestoreFromBackup.php#L232
for dir in \ for dir in \
'data/private_uploads' \ 'data/private_uploads' \
'data/private_uploads/assets' \ 'data/private_uploads/assets' \
'data/private_uploads/accessories' \
'data/private_uploads/audits' \ 'data/private_uploads/audits' \
'data/private_uploads/components' \
'data/private_uploads/consumables' \
'data/private_uploads/eula-pdfs' \
'data/private_uploads/imports' \ 'data/private_uploads/imports' \
'data/private_uploads/assetmodels' \ 'data/private_uploads/assetmodels' \
'data/private_uploads/users' \ 'data/private_uploads/users' \
'data/private_uploads/licenses' \ 'data/private_uploads/licenses' \
'data/private_uploads/signatures' \ 'data/private_uploads/signatures' \
'data/uploads/accessories' \ 'data/uploads/accessories' \
'data/uploads/assets' \
'data/uploads/avatars' \ 'data/uploads/avatars' \
'data/uploads/barcodes' \ 'data/uploads/barcodes' \
'data/uploads/categories' \ 'data/uploads/categories' \