From a806023a55ddc9c727e7b694fbd9801f5f000db4 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Tue, 8 Sep 2020 15:40:53 +0200 Subject: [PATCH] Add docker-compose scripts --- .ci/ogc/docker-compose.yml | 27 +++++++++++++++++++++++++++ .ci/ogc/nginx.conf | 31 +++++++++++++++++++++++++++++++ .ci/ogc/qgis_mapserv.sh | 2 +- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 .ci/ogc/docker-compose.yml create mode 100644 .ci/ogc/nginx.conf diff --git a/.ci/ogc/docker-compose.yml b/.ci/ogc/docker-compose.yml new file mode 100644 index 00000000000..b84b6533a2a --- /dev/null +++ b/.ci/ogc/docker-compose.yml @@ -0,0 +1,27 @@ +version: '3' +services: + + nginx: + image: nginx:1.13 + container_name: qgis_server_nginx + ports: + - 8089:80 + networks: + - qgis + volumes: + - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro + depends_on: + - qgis-server + + qgis-server: + image: qgis_server_deps + container_name: qgis_server_deps + volumes: + - ./../../:/usr/src/qgis/ + networks: + - qgis + privileged: true + +networks: + qgis: + driver: bridge diff --git a/.ci/ogc/nginx.conf b/.ci/ogc/nginx.conf new file mode 100644 index 00000000000..d1b1c7e240a --- /dev/null +++ b/.ci/ogc/nginx.conf @@ -0,0 +1,31 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + root /var/www/html; + + # Add index.php to the list if you are using PHP + index index.html index.htm index.nginx-debian.html; + + server_name _; + + location / { + try_files $uri $uri/ =404; + } + + location /qgisserver { + fastcgi_pass qgis-server:5555; + add_header Access-Control-Allow-Origin *; + add_header 'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,X-Requested-With'; + fastcgi_param PATH_INFO $fastcgi_script_name; + fastcgi_param REQUEST_METHOD $request_method; + fastcgi_param QUERY_STRING $query_string; + fastcgi_param CONTENT_TYPE $content_type; + fastcgi_param CONTENT_LENGTH $content_length; + fastcgi_param SERVER_PROTOCOL $server_protocol; + fastcgi_param REQUEST_URI $request_uri; + fastcgi_param HTTPS $https if_not_empty; + fastcgi_param SERVER_PORT 80; + fastcgi_param SERVER_NAME $server_addr; + } +} diff --git a/.ci/ogc/qgis_mapserv.sh b/.ci/ogc/qgis_mapserv.sh index 24ac9efe44c..6286c794edd 100644 --- a/.ci/ogc/qgis_mapserv.sh +++ b/.ci/ogc/qgis_mapserv.sh @@ -4,4 +4,4 @@ export QGIS_SERVER_LOG_FILE=/var/log/qgisserver.log export QGIS_SERVER_LOG_LEVEL=0 export QGIS_PREFIX_PATH=/usr/local/ -exec /usr/bin/spawn-fcgi -n -p 5555 /usr/local/bin/qgis_mapserv.fcgi +exec /usr/bin/spawn-fcgi -n -p 5555 /usr/src/qgis/build/output/bin/qgis_mapserv.fcgi