Fixing ref slug

This commit is contained in:
David Négrier 2020-04-13 15:44:33 +02:00
parent d519538531
commit 0ba6941cd2
2 changed files with 8 additions and 4 deletions

View File

@ -59,9 +59,12 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
# Create a slugified value of the branch
- uses: rlespinasse/github-slug-action@master
- name: Deploy - name: Deploy
uses: thecodingmachine/deeployer@master uses: thecodingmachine/deeployer@master
env: env:
KUBE_CONFIG_FILE: ${{ secrets.KUBE_CONFIG_FILE }} KUBE_CONFIG_FILE: ${{ secrets.KUBE_CONFIG_FILE }}
with: with:
namespace: workadventure-${GITHUB_REF##*/} namespace: workadventure-${{GITHUB_REF_SLUG}}

View File

@ -1,11 +1,12 @@
{ {
local env = std.extVar("env"), local env = std.extVar("env"),
# FIXME: namespace does not work if the branch contains a "/" # FIXME: namespace does not work if the branch contains a "/"
local namespace = std.split(env.GITHUB_REF, "/")[2], local namespace = env.GITHUB_REF_SLUG,
local tag = if namespace == "master" then "latest" else namespace,
"$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:"+(if namespace == "master" then "latest" else namespace), "image": "thecodingmachine/workadventure-back:"+tag,
"host": "api."+namespace+".workadventure.test.thecodingmachine.com", "host": "api."+namespace+".workadventure.test.thecodingmachine.com",
"ports": [8080], "ports": [8080],
"env": { "env": {
@ -13,7 +14,7 @@
} }
}, },
"front": { "front": {
"image": "thecodingmachine/workadventure-front:"+(if namespace == "master" then "latest" else namespace), "image": "thecodingmachine/workadventure-front:"+tag,
"host": namespace+".workadventure.test.thecodingmachine.com", "host": namespace+".workadventure.test.thecodingmachine.com",
"ports": [80], "ports": [80],
"env": { "env": {