Skip to content
Snippets Groups Projects
Commit 75262530 authored by FORESTIER Fabien's avatar FORESTIER Fabien
Browse files

Add sandbox branch, ci trigger

parent d18ac4f3
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -7,6 +7,7 @@ test_development: ...@@ -7,6 +7,7 @@ test_development:
stage: test stage: test
only: only:
- master - master
- sandbox
script: script:
- docker-compose --project-name data-reloaded-dev-testing -f docker-compose-development.tests.yml build - docker-compose --project-name data-reloaded-dev-testing -f docker-compose-development.tests.yml build
- docker-compose --project-name data-reloaded-dev-testing -f docker-compose-development.tests.yml up -d - docker-compose --project-name data-reloaded-dev-testing -f docker-compose-development.tests.yml up -d
...@@ -15,6 +16,7 @@ build_development: ...@@ -15,6 +16,7 @@ build_development:
stage: build stage: build
only: only:
- master - master
- sandbox
script: script:
- docker-compose --project-name data-reloaded-dev -f docker-compose-development.yml build - docker-compose --project-name data-reloaded-dev -f docker-compose-development.yml build
...@@ -22,6 +24,7 @@ deploy_development: ...@@ -22,6 +24,7 @@ deploy_development:
stage: deploy stage: deploy
only: only:
- master - master
- sandbox
script: script:
- docker-compose --project-name data-reloaded-dev -f docker-compose-development.yml up -d - docker-compose --project-name data-reloaded-dev -f docker-compose-development.yml up -d
environment: environment:
......
...@@ -42,4 +42,17 @@ server { ...@@ -42,4 +42,17 @@ server {
add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
} }
location /wordpress/ {
#proxy_pass https://elastic2.recette.data.grandlyon.com/elastic/;
proxy_pass http://192.168.62.15:8000/;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
#proxy_set_header Host $http_host;
# proxy_set_header Host elastic.datalab.erasme.org;
# add_header 'Access-Control-Allow-Origin' '*';
# add_header 'Access-Control-Allow-Credentials' 'true';
# add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';
# add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
}
} }
...@@ -16,7 +16,7 @@ export const environment = { ...@@ -16,7 +16,7 @@ export const environment = {
en: '/en' en: '/en'
}, },
wordpressUrl: 'http://192.168.62.15:8000/wp-json/wp/v2/', wordpressUrl: '/wordpress/wp-json/wp/v2/',
wordpressStaticPages: { wordpressStaticPages: {
approach: 'la-demarche', approach: 'la-demarche',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment