From e128b03761d3f6ed3b0b008729369133290e7462 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Wed, 15 Nov 2023 15:45:11 +0100 Subject: [PATCH] Update Dockerfile --- x-pack/metricbeat/module/stan/_meta/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index 08e08077ff35..20604392f603 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,11 +2,7 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage -<<<<<<< HEAD -FROM golang:1.20.10 -======= FROM golang:1.20.11 AS build-env ->>>>>>> f04686c188 ([Automation] Bump Golang version to 1.20.11 (#37123)) RUN apt-get install git mercurial gcc RUN git clone https://github.com/nats-io/stan.go.git /stan-go RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build .