Fixing libsonnet and changing deployment namespace

This commit is contained in:
David Négrier 2020-04-13 15:14:16 +02:00
parent b0c347b41b
commit d519538531
2 changed files with 4 additions and 5 deletions

View File

@ -63,6 +63,5 @@ jobs:
uses: thecodingmachine/deeployer@master
env:
KUBE_CONFIG_FILE: ${{ secrets.KUBE_CONFIG_FILE }}
AUTOCONNECT: 1
with:
namespace: workadventure-master
namespace: workadventure-${GITHUB_REF##*/}

View File

@ -1,11 +1,11 @@
{
local env = std.extVar("env"),
# FIXME: namespace does not work if the branch contains a "/"
local namespace = std.split(env.GITHUB_REF, "/")[2]
local namespace = std.split(env.GITHUB_REF, "/")[2],
"$schema": "https://raw.githubusercontent.com/thecodingmachine/deeployer/master/deeployer.schema.json",
"containers": {
"back": {
"image": "thecodingmachine/workadventure-back:"+namespace,
"image": "thecodingmachine/workadventure-back:"+(if namespace == "master" then "latest" else namespace),
"host": "api."+namespace+".workadventure.test.thecodingmachine.com",
"ports": [8080],
"env": {
@ -13,7 +13,7 @@
}
},
"front": {
"image": "thecodingmachine/workadventure-front:"+namespace,
"image": "thecodingmachine/workadventure-front:"+(if namespace == "master" then "latest" else namespace),
"host": namespace+".workadventure.test.thecodingmachine.com",
"ports": [80],
"env": {