Merge pull request #147 from stackhpc/wallaby-ubuntu-jiralert

jiralert: Fix Ubuntu builds
stackhpc · Jul 14, 2022 · edd4eba · edd4eba
2 parents 3fc49b2 + 25d201a
commit edd4eba
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/docker/prometheus/prometheus-jiralert/Dockerfile.j2 b/docker/prometheus/prometheus-jiralert/Dockerfile.j2
@@ -15,7 +15,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     ] %}
 {% elif base_package_type == 'deb' %}
     {% set prometheus_jiralert_packages = [
-        'golang-go',
+        'golang-1.16-go',
+        'make',
     ] %}
 {% endif %}
 
@@ -28,7 +29,8 @@ ARG prometheus_jiralert_url=https://github.com/stackhpc/jiralert/archive/refs/he
 
 {% block prometheus_jiralert_install %}
 ENV GOPATH=/build
-RUN mkdir /build \
+RUN PATH={% if base_package_type == 'deb' %}/usr/lib/go-1.16/bin:{% endif %}$PATH \
+    && mkdir /build \
     && cd /build \
     && curl -o jiralert.tar.gz ${prometheus_jiralert_url} \
     && tar xvf jiralert.tar.gz \