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

Merge pull request #14379 from chandanchowdhury/master

Browse source 
Fix #13515: Cannot restore backup
This commit is contained in:
snipe 2024-03-07 11:30:06 +00:00 committed by GitHub
parent 4b13fa45c5 b65bf5082d
commit b3aba4ad99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/version.php
View file

@ -6,5 +6,5 @@ return array (
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g9a5c1b812', 'hash_version' => 'g9a5c1b812',
'full_hash' => 'v6.3.2-160-g9a5c1b812', 'full_hash' => 'v6.3.2-160-g9a5c1b812',
'branch' => 'develop', 'branch' => 'master',
); );

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' \