diff --git a/.env b/.env new file mode 100644 index 0000000..bc3cc95 --- /dev/null +++ b/.env @@ -0,0 +1,5 @@ +COMPOSE_PROJECT_NAME=gdp + +CLIENT_ROOT=./client +SYNOPSX_ROOT=./synopsyx +LOG_ROOT=./log diff --git a/.gitignore b/.gitignore index 70ea652..8a93a6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ client/* -api/* +synopsx/* log/* diff --git a/.gitmodules b/.gitmodules index b334f8a..c94d604 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "client"] path = client url = https://figureslibres.io/gogs/bachir/gdp_vuewp.git +[submodule "synopsx"] + path = synopsx + url = https://github.com/guidesDeParis/synopsx.git diff --git a/Docker/basex/Dockerfile b/Docker/basex/Dockerfile new file mode 100644 index 0000000..b045a4f --- /dev/null +++ b/Docker/basex/Dockerfile @@ -0,0 +1 @@ +FROM basex/basexhttp:latest diff --git a/Docker/nginx/Dockerfile b/Docker/nginx/Dockerfile new file mode 100644 index 0000000..aa3e544 --- /dev/null +++ b/Docker/nginx/Dockerfile @@ -0,0 +1,5 @@ +FROM nginx:latest + +COPY ./default.conf /etc/nginx/conf.d/default.conf +COPY ./bashrc /root/.bashrc +COPY ./inputrc /root/.inputrc diff --git a/Docker/nginx/bashrc b/Docker/nginx/bashrc new file mode 100644 index 0000000..74d78f9 --- /dev/null +++ b/Docker/nginx/bashrc @@ -0,0 +1,3 @@ +PS1='\e[36m\e[1mNGINX\e[0m:\e[90m\w\e[0m\n$ ' +bind '"\e[A": history-search-backward' +bind '"\e[B": history-search-forward' diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf new file mode 100644 index 0000000..65b57e7 --- /dev/null +++ b/Docker/nginx/default.conf @@ -0,0 +1,25 @@ +server { + listen 80 default_server; + root /var/www/html/dist; + index index.html; + + charset utf-8; + + location / { + try_files $uri $uri/ /index.php?$query_string; + } + + location = /favicon.ico { access_log off; log_not_found off; } + location = /robots.txt { access_log off; log_not_found off; } + + access_log on; + error_log /var/log/nginx/error.log error; + + sendfile off; + + client_max_body_size 100m; + + location ~ /\.ht { + deny all; + } +} diff --git a/Docker/nginx/inputrc b/Docker/nginx/inputrc new file mode 100644 index 0000000..db8d91d --- /dev/null +++ b/Docker/nginx/inputrc @@ -0,0 +1,2 @@ +set show-all-if-ambiguous on +set completion-ignore-case on diff --git a/README.md b/README.md index 3eac700..ccfce22 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # docker-gdp +https://github.com/guidesDeParis/webapp/blob/master/install.md + +http://docs.basex.org/wiki/Docker diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..f875950 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,28 @@ +version: "3.5" + +services: + basex: + build: ./Docker/basex + ports: + - 1984:1984 + - 8984:8984 + # volumes: + - "${SYNOPSX_ROOT}:/srv/basex/webapp/synopsx" + # - "${API_ROOT}:/srv/basex/data" + # - "${}:/srv/basex/repo" + # - "${LOG_ROOT}:/var/log:rw" + + nginx: + build: ./Docker/nginx/ + ports: + - 8990:80 + volumes: + - "${CLIENT_ROOT}:/var/www/html" + - "${LOG_ROOT}:/var/log:rw" + working_dir: "/var/www/html/" + networks: + depends_on: + + volumes: + + networks: diff --git a/synopsx b/synopsx new file mode 160000 index 0000000..4f4c2d8 --- /dev/null +++ b/synopsx @@ -0,0 +1 @@ +Subproject commit 4f4c2d89cda9730e1f851ad88d23e61e17c590c7