From a59e40fc8e01675da1651b7be469bd3e3f418507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 9 Dec 2020 15:19:22 +0100 Subject: [PATCH] Fixing deployment --- .github/workflows/build-and-deploy.yml | 4 ++-- deeployer.libsonnet | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 24b22f1f..e0e21c8c 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -71,11 +71,11 @@ jobs: - name: "Build and push back image" uses: docker/build-push-action@v1 with: - dockerfile: back/Dockerfile + dockerfile: pusher/Dockerfile path: ./ username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - repository: thecodingmachine/workadventure-back + repository: thecodingmachine/workadventure-pusher tags: ${{ env.GITHUB_REF_SLUG }} add_git_labels: true diff --git a/deeployer.libsonnet b/deeployer.libsonnet index fc9d005f..b63ab48c 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -36,7 +36,7 @@ "ADMIN_API_TOKEN": env.ADMIN_API_TOKEN, "JITSI_ISS": env.JITSI_ISS, "JITSI_URL": env.JITSI_URL, - "API_URL": "api."+url, + "API_URL": "back:50051", "SECRET_JITSI_KEY": env.SECRET_JITSI_KEY, } + if adminUrl != null then { "ADMIN_API_URL": adminUrl,