From 8d33339cf52a1064a4cd5eab40273f7d5d163fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Wed, 21 Sep 2022 17:23:41 +0100
Subject: [PATCH] fix(demo): reorder demo build steps

---
 demo/Dockerfile   | 8 ++++----
 demo/generator.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demo/Dockerfile b/demo/Dockerfile
index 87960fd43..5054ac7db 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -1,8 +1,8 @@
 FROM node:18.9.0-alpine as nodejs-builder
 RUN mkdir -p /src/ui
+RUN apk add make git
 COPY ui/package.json ui/package-lock.json /src/ui/
 RUN cd /src/ui && npm ci && touch node_modules/.install
-RUN apk add make git
 COPY ui /src/ui
 RUN make -C /src/ui build
 
@@ -13,10 +13,10 @@ COPY make /src/make
 COPY go.mod /src/go.mod
 COPY go.sum /src/go.sum
 RUN make -C /src download-deps-go
+COPY --from=nodejs-builder /src/ui/embed.go /src/ui/embed.go
+COPY --from=nodejs-builder /src/ui/mock /src/ui/mock
 COPY --from=nodejs-builder /src/ui/src /src/ui/src
 COPY --from=nodejs-builder /src/ui/build /src/ui/build
-COPY --from=nodejs-builder /src/ui/mock /src/ui/mock
-COPY --from=nodejs-builder /src/ui/embed.go /src/ui/embed.go
 COPY cmd /src/cmd
 COPY internal /src/internal
 ARG VERSION
@@ -31,10 +31,10 @@ COPY demo/supervisord.conf /etc/supervisord.conf
 COPY demo/alertmanager.yaml /etc/alertmanager.yaml
 COPY demo/generator.py /generator.py
 COPY demo/prometheus.py /prometheus.py
-COPY --from=go-builder /src/karma /karma
 COPY demo/karma.yaml /etc/karma.yaml
 COPY demo/acls.yaml /etc/acls.yaml
 RUN adduser -D karma
+COPY --from=go-builder /src/karma /karma
 USER karma
 ENV GOGC=50
 EXPOSE 8080
diff --git a/demo/generator.py b/demo/generator.py
index 51194bacb..f0831a719 100755
--- a/demo/generator.py
+++ b/demo/generator.py
@@ -482,7 +482,7 @@ class SilencedAlertWithJiraLink(AlertGenerator):
                 "{}Z".format(now.isoformat()),
                 "{}Z".format((now + datetime.timedelta(minutes=30)).isoformat()),
                 "me@example.com",
-                "DEVOPS-123 This text should be a link to the Jira ticket",
+                "This text - DEVOPS-123 - should be a link to the Jira ticket",
             )
         ]