Merge pull request #107 from thecodingmachine/domain_name

Deploying master on new workadventu.re domain
This commit is contained in:
David Négrier 2020-05-13 16:07:06 +02:00 committed by GitHub
commit 7d67b62cf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -78,6 +78,7 @@ jobs:
- name: Add a comment in PR - name: Add a comment in PR
uses: unsplash/comment-on-pr@v1.2.0 uses: unsplash/comment-on-pr@v1.2.0
if: ${{ github.event_name == 'pull_request' }}
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:

View File

@ -2,12 +2,13 @@
local env = std.extVar("env"), local env = std.extVar("env"),
local namespace = env.GITHUB_REF_SLUG, local namespace = env.GITHUB_REF_SLUG,
local tag = namespace, local tag = namespace,
local url = if namespace == "master" then "wordadventu.re" else namespace+".workadventure.test.thecodingmachine.com",
"$schema": "https://raw.githubusercontent.com/thecodingmachine/deeployer/master/deeployer.schema.json", "$schema": "https://raw.githubusercontent.com/thecodingmachine/deeployer/master/deeployer.schema.json",
"containers": { "containers": {
"back": { "back": {
"image": "thecodingmachine/workadventure-back:"+tag, "image": "thecodingmachine/workadventure-back:"+tag,
"host": { "host": {
"url": "api."+namespace+".workadventure.test.thecodingmachine.com", "url": "api."+url,
"https": "enable" "https": "enable"
}, },
"ports": [8080], "ports": [8080],
@ -18,12 +19,12 @@
"front": { "front": {
"image": "thecodingmachine/workadventure-front:"+tag, "image": "thecodingmachine/workadventure-front:"+tag,
"host": { "host": {
"url": namespace+".workadventure.test.thecodingmachine.com", "url": url,
"https": "enable" "https": "enable"
}, },
"ports": [80], "ports": [80],
"env": { "env": {
"API_URL": "https://api."+namespace+".workadventure.test.thecodingmachine.com" "API_URL": "https://api."+url
} }
} }
}, },