diff --git a/config/version.php b/config/version.php index 7ebc945279..627d5b0494 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v6.3.2', - 'full_app_version' => 'v6.3.2 - build 12834-g9a5c1b812', - 'build_version' => '12834', + 'full_app_version' => 'v6.3.2 - build 12875-g21ad7f549', + 'build_version' => '12875', 'prerelease_version' => '', - 'hash_version' => 'g9a5c1b812', - 'full_hash' => 'v6.3.2-160-g9a5c1b812', - 'branch' => 'master', + 'hash_version' => 'g21ad7f549', + 'full_hash' => 'v6.3.2-39-g21ad7f549', + 'branch' => 'develop', ); \ No newline at end of file diff --git a/docker/startup.sh b/docker/startup.sh index 55ffd66909..62002a2ba0 100644 --- a/docker/startup.sh +++ b/docker/startup.sh @@ -17,16 +17,23 @@ else fi # 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 \ 'data/private_uploads' \ 'data/private_uploads/assets' \ + 'data/private_uploads/accessories' \ 'data/private_uploads/audits' \ + 'data/private_uploads/components' \ + 'data/private_uploads/consumables' \ + 'data/private_uploads/eula-pdfs' \ 'data/private_uploads/imports' \ 'data/private_uploads/assetmodels' \ 'data/private_uploads/users' \ 'data/private_uploads/licenses' \ 'data/private_uploads/signatures' \ 'data/uploads/accessories' \ + 'data/uploads/assets' \ 'data/uploads/avatars' \ 'data/uploads/barcodes' \ 'data/uploads/categories' \