fix(demo): reorder demo build steps

This commit is contained in:
Łukasz Mierzwa
2022-09-21 17:23:41 +01:00
committed by Łukasz Mierzwa
parent ef2928ff13
commit 8d33339cf5
2 changed files with 5 additions and 5 deletions

View File

@@ -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

View File

@@ -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",
)
]