From ea6a8ff406f01aaba88feb2cc8e2e4722fb892b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Fri, 4 Dec 2020 15:13:35 +0100
Subject: [PATCH] Adding pusher to K8S deploy

---
 .github/workflows/build-and-deploy.yml | 29 +++++++++++++++++++++++---
 deeployer.libsonnet                    | 18 ++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 390f2556..d224f10d 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -43,7 +43,30 @@ jobs:
         uses: actions/checkout@v2
 
       # Create a slugified value of the branch
-      - uses: rlespinasse/github-slug-action@1.1.1
+      - uses: rlespinasse/github-slug-action@3.1.0
+
+      - name: "Build and push back image"
+        uses: docker/build-push-action@v1
+        with:
+          dockerfile: back/Dockerfile
+          path: ./
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: thecodingmachine/workadventure-back
+          tags: ${{ env.GITHUB_REF_SLUG }}
+          add_git_labels: true
+
+  build-pusher:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # Create a slugified value of the branch
+      - uses: rlespinasse/github-slug-action@3.1.0
 
       - name: "Build and push back image"
         uses: docker/build-push-action@v1
@@ -66,7 +89,7 @@ jobs:
         uses: actions/checkout@v2
 
       # Create a slugified value of the branch
-      - uses: rlespinasse/github-slug-action@1.1.1
+      - uses: rlespinasse/github-slug-action@3.1.0
 
       - name: "Build and push back image"
         uses: docker/build-push-action@v1
@@ -90,7 +113,7 @@ jobs:
 
 
       # Create a slugified value of the branch
-      - uses: rlespinasse/github-slug-action@1.1.1
+      - uses: rlespinasse/github-slug-action@3.1.0
 
       - name: "Build and push front image"
         uses: docker/build-push-action@v1
diff --git a/deeployer.libsonnet b/deeployer.libsonnet
index db86fbb4..fc9d005f 100644
--- a/deeployer.libsonnet
+++ b/deeployer.libsonnet
@@ -24,6 +24,24 @@
          "ADMIN_API_URL": adminUrl,
        } else {}
      },
+     "pusher": {
+            "image": "thecodingmachine/workadventure-pusher:"+tag,
+            "host": {
+              "url": "pusher."+url,
+              "https": "enable"
+            },
+            "ports": [8080],
+            "env": {
+              "SECRET_KEY": "tempSecretKeyNeedsToChange",
+              "ADMIN_API_TOKEN": env.ADMIN_API_TOKEN,
+              "JITSI_ISS": env.JITSI_ISS,
+              "JITSI_URL": env.JITSI_URL,
+              "API_URL": "api."+url,
+              "SECRET_JITSI_KEY": env.SECRET_JITSI_KEY,
+            } + if adminUrl != null then {
+              "ADMIN_API_URL": adminUrl,
+            } else {}
+          },
     "front": {
       "image": "thecodingmachine/workadventure-front:"+tag,
       "host": {