DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 22:37:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move develop fixes to master

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2021-04-06 05:05:16 -07:00
parent d61d189328
commit 7da32443ff
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -73,7 +73,7 @@ COPY docker/001-default-ssl.conf /etc/apache2/sites-available/001-default-ssl.co
RUN a2enmod ssl RUN a2enmod ssl
RUN a2ensite 001-default-ssl.conf RUN a2ensite 001-default-ssl.conf
COPY --chown=docker . /var/www/html COPY . /var/www/html
RUN a2enmod rewrite RUN a2enmod rewrite
@ -86,7 +86,9 @@ WORKDIR /var/www/html
#copy all configuration files #copy all configuration files
# COPY docker/*.php /var/www/html/app/config/production/ # COPY docker/*.php /var/www/html/app/config/production/
COPY --chown=docker docker/docker.env /var/www/html/.env COPY docker/docker.env /var/www/html/.env
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" \
@ -95,6 +97,7 @@ RUN \
&& mkdir -p "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \ && mkdir -p "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
&& ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \ && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
&& chown docker "/var/lib/snipeit/keys/" \ && chown docker "/var/lib/snipeit/keys/" \
&& chown -h docker "/var/www/html/storage/*.key" \
&& chmod +x /var/www/html/artisan \ && chmod +x /var/www/html/artisan \
&& echo "Finished setting up application in /var/www/html" && echo "Finished setting up application in /var/www/html"