_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #56 from thecodingmachine/enabling_https

Browse Source 
Enabling HTTPS in test deployment
This commit is contained in:
David Négrier 2020-04-22 23:40:46 +02:00 committed by GitHub
commit 6c6625fd41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-and-deploy.yml vendored
View File

@ -81,17 +81,17 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
msg: Environment deployed at http://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com msg: Environment deployed at https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com
check_for_duplicate_msg: true check_for_duplicate_msg: true
- name: Run Cypress tests - name: Run Cypress tests
uses: cypress-io/github-action@v1 uses: cypress-io/github-action@v1
env: env:
CYPRESS_BASE_URL: http://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com CYPRESS_BASE_URL: https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com
with: with:
env: host=${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com,port=80 env: host=${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com,port=80
spec: cypress/integration/spec.js spec: cypress/integration/spec.js
wait-on: http://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com wait-on: https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com
working-directory: e2e working-directory: e2e
- name: "Upload the screenshot on test failure" - name: "Upload the screenshot on test failure"

13
deeployer.libsonnet
View File

@ -7,7 +7,8 @@
"back": { "back": {
"image": "thecodingmachine/workadventure-back:"+tag, "image": "thecodingmachine/workadventure-back:"+tag,
"host": { "host": {
"url": "api."+namespace+".workadventure.test.thecodingmachine.com" "url": "api."+namespace+".workadventure.test.thecodingmachine.com",
"https": "enable"
}, },
"ports": [8080], "ports": [8080],
"env": { "env": {
@ -17,12 +18,18 @@
"front": { "front": {
"image": "thecodingmachine/workadventure-front:"+tag, "image": "thecodingmachine/workadventure-front:"+tag,
"host": { "host": {
"url": namespace+".workadventure.test.thecodingmachine.com" "url": namespace+".workadventure.test.thecodingmachine.com",
"https": "enable"
}, },
"ports": [80], "ports": [80],
"env": { "env": {
"API_URL": "http://api."+namespace+".workadventure.test.thecodingmachine.com" "API_URL": "https://api."+namespace+".workadventure.test.thecodingmachine.com"
} }
} }
},
"config": {
"https": {
"mail": "d.negrier@thecodingmachine.com"
}
} }
} }