Commit a1593835 authored by Jérôme Chauveau's avatar Jérôme Chauveau
Browse files

Merge branch 'dev'

parents 48ec3a1c e4b21fc0
Loading
Loading
Loading
Loading
−3

File deleted.

+2
Changes for .gitignore: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@
/ui/js/lib
/editions/*
/configuration/configuration.xml
.idea
.DS_Store
 No newline at end of file
+11 −1
Changes for Dockerfile: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
FROM basex/basexhttp:latest
MAINTAINER Certic-Pdn TEAM <contact.certic@unicaen.fr>
COPY . /srv/BaseXWeb
 No newline at end of file
COPY max.xq /srv/basex/webapp
COPY rxq /srv/basex/webapp/rxq
COPY configuration /srv/basex/webapp/configuration
COPY editions /srv/basex/webapp/editions
COPY plugins /srv/basex/webapp/plugins
COPY ui /srv/basex/webapp/ui
COPY node_modules/bootstrap/dist/js/bootstrap.bundle.min.js /srv/basex/webapp/ui/lib
COPY node_modules/bootstrap/dist/css/bootstrap.min.css /srv/basex/webapp/ui/lib
COPY node_modules/bootstrap/dist/js/bootstrap.min.js /srv/basex/webapp/ui/lib
COPY node_modules/jquery/dist/jquery.min.js /srv/basex/webapp/ui/lib
COPY node_modules/popper.js/dist/popper.min.js /srv/basex/webapp/ui/lib
−31

File deleted.

−73

File deleted.

Loading