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

applying PR #3456 changes to develop branch (#3472)

Browse source 
* updating with changes made to master

apply PR # 3456 to develop as well

* updating develop with changes made to master

apply PR # 3456 to develop as well

* updating paveit with passport-created oauth tables
This commit is contained in:
Kasey 2017-03-31 15:43:37 -07:00 committed by snipe
parent 1bb89db451
commit 5663429280
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ubuntu:trusty FROM debian:jessie-slim
MAINTAINER Brady Wetherington <uberbrady@gmail.com> MAINTAINER Brady Wetherington <uberbrady@gmail.com>
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
@ -13,7 +13,9 @@ patch \
curl \ curl \
vim \ vim \
git \ git \
mysql-client mysql-client \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN php5enmod mcrypt RUN php5enmod mcrypt
RUN php5enmod gd RUN php5enmod gd
@ -55,7 +57,6 @@ RUN chown -R docker /var/www/html
RUN \ RUN \
rm -r "/var/www/html/storage/private_uploads" && ln -fs "/var/lib/snipeit/data/private_uploads" "/var/www/html/storage/private_uploads" \ rm -r "/var/www/html/storage/private_uploads" && ln -fs "/var/lib/snipeit/data/private_uploads" "/var/www/html/storage/private_uploads" \
&& mkdir -p "/var/lib/snipeit/data/uploads/{assets,avatars,barcodes,models,suppliers}" \
&& rm -rf "/var/www/html/public/uploads" && ln -fs "/var/lib/snipeit/data/uploads" "/var/www/html/public/uploads" \ && rm -rf "/var/www/html/public/uploads" && ln -fs "/var/lib/snipeit/data/uploads" "/var/www/html/public/uploads" \
&& rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups"

5
app/Console/Commands/PaveIt.php
View file

@ -117,6 +117,11 @@ class PaveIt extends Command
\DB::statement('drop table IF EXISTS manufacturers'); \DB::statement('drop table IF EXISTS manufacturers');
\DB::statement('drop table IF EXISTS models'); \DB::statement('drop table IF EXISTS models');
\DB::statement('drop table IF EXISTS migrations'); \DB::statement('drop table IF EXISTS migrations');
\DB::statement('drop table IF EXISTS oauth_access_tokens');
\DB::statement('drop table IF EXISTS oauth_auth_codes');
\DB::statement('drop table IF EXISTS oauth_clients');
\DB::statement('drop table IF EXISTS oauth_personal_access_clients');
\DB::statement('drop table IF EXISTS oauth_refresh_tokens');
\DB::statement('drop table IF EXISTS password_resets'); \DB::statement('drop table IF EXISTS password_resets');
\DB::statement('drop table IF EXISTS requested_assets'); \DB::statement('drop table IF EXISTS requested_assets');
\DB::statement('drop table IF EXISTS requests'); \DB::statement('drop table IF EXISTS requests');

2
docker/entrypoint.sh
View file

@ -18,7 +18,7 @@ else
fi fi
# create data directories # create data directories
for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/models' 'data/uploads/suppliers' 'dumps'; do for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/models' 'data/uploads/suppliers' 'dumps'; do
mkdir -p "/var/lib/snipeit/$dir" mkdir -p "/var/lib/snipeit/$dir"
done done