From d5195385316031f647c04676987b2b5b2a72462e Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20N=C3=A9grier?= Date: Mon, 13 Apr 2020 15:14:16 +0200 Subject: [PATCH] Fixing libsonnet and changing deployment namespace --- .github/workflows/build-and-deploy.yml | 3 +-- deeployer.libsonnet | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 7425cb4..1dd48da 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -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##*/} diff --git a/deeployer.libsonnet b/deeployer.libsonnet index 60c5d47..51c5558 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -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": { -- 2.25.1