From d9c4c771740b819e2cc9094e6f5eb10f2c3efe70 Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen@paragon-es.de> Date: Mon, 9 Nov 2020 12:00:24 +0100 Subject: [PATCH] ansible-roles/alerta#10 Pin API and web-ui version and no longer use master --- defaults/main.yml | 2 ++ templates/api/Dockerfile | 2 +- templates/webui/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 defaults/main.yml diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000..6935dd9 --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,2 @@ +alerta_version_api: 8.1.0 +alerta_version_web_ui: 8.0.1 diff --git a/templates/api/Dockerfile b/templates/api/Dockerfile index b3f9ae7..3b7bf50 100644 --- a/templates/api/Dockerfile +++ b/templates/api/Dockerfile @@ -1,4 +1,4 @@ -FROM alerta/alerta-web +FROM alerta/alerta-web:{{ alerta_version_api }} USER root COPY ./plugins/*.py /tmp/plugins/ diff --git a/templates/webui/Dockerfile b/templates/webui/Dockerfile index 3172ca4..3f32f63 100644 --- a/templates/webui/Dockerfile +++ b/templates/webui/Dockerfile @@ -3,7 +3,7 @@ FROM node:lts-alpine as build-stage RUN apk add --no-cache git WORKDIR /app -ADD https://github.com/alerta/alerta-webui/archive/master.tar.gz /tmp/webui.tar.gz +ADD https://github.com/alerta/alerta-webui/archive/v{{ alerta_version_web_ui }}.tar.gz /tmp/webui.tar.gz RUN tar zxvf /tmp/webui.tar.gz -C /app --strip-components=1 RUN npm install COPY .env . -- GitLab