From e4beb6ac0249ddeb15094c961c870d58ae6febc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Mon, 28 Jan 2019 16:08:22 +0000 Subject: [PATCH 1/2] chore(demo): use 10.15.0 when building demo docker image --- demo/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/Dockerfile b/demo/Dockerfile index 62c2c2ea6..9312f4365 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10.14.2-alpine as nodejs-builder +FROM node:10.15.0-alpine as nodejs-builder RUN apk add --update make git COPY . /karma RUN make -C /karma ui From 5e887ee061740a6b8f98ff3828eef861f08d0aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Mon, 28 Jan 2019 16:08:47 +0000 Subject: [PATCH 2/2] chore(demo): pin alpine image --- demo/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/Dockerfile b/demo/Dockerfile index 9312f4365..30d3d8a09 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -9,7 +9,7 @@ ARG VERSION RUN apk add --update make git RUN CGO_ENABLED=0 make -C /go/src/github.com/prymitive/karma VERSION="${VERSION:-dev}" karma -FROM alpine:latest +FROM alpine:3.8 RUN apk add --update supervisor python && rm -rf /tmp/* /var/cache/apk/* COPY demo/supervisord.conf /etc/supervisord.conf COPY --from=prom/alertmanager:v0.15.3 /bin/alertmanager /alertmanager