Resolve missed conflicts.

elastic · Aug 4, 2023 · 6dd513c · 6dd513c
1 parent e59ad56
commit 6dd513c
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 35 deletions.
diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 FROM golang:alpine3.15 as builder
-=======
-FROM golang:1.20.7 as builder
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 

diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 FROM golang:alpine3.15 as builder
-=======
-FROM golang:1.20.7 as builder
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 

diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 FROM golang:alpine3.15 as builder
-=======
-FROM golang:1.20.7 as builder
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 

diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.16.5
-=======
-FROM golang:1.20.7
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+FROM golang:1.19.12
 
 COPY test/main.go main.go
 

diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile
@@ -2,17 +2,10 @@ ARG NATS_VERSION=2.0.4
 FROM nats:$NATS_VERSION
 
 # build stage
-<<<<<<< HEAD
 FROM golang:1.13-alpine3.11 AS build-env
 RUN apk --no-cache add build-base git mercurial gcc
 RUN cd src && go get -d github.com/nats-io/nats.go/
 RUN cd src/github.com/nats-io/nats.go/examples/nats-bench && git checkout tags/v1.10.0 && go build .
-=======
-FROM golang:1.20.7 AS build-env
-RUN apt-get install git mercurial gcc
-RUN git clone https://github.com/nats-io/nats.go.git /nats-go
-RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build .
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 # create an enhanced container with nc command available since nats is based
 # on scratch image making healthcheck impossible

diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile
@@ -1,9 +1,5 @@
 ARG VSPHERE_GOLANG_VERSION
-<<<<<<< HEAD
 FROM golang:${VSPHERE_GOLANG_VERSION}-alpine
-=======
-FROM golang:1.20.7
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 RUN apk add --no-cache curl git
 RUN go install github.com/vmware/govmomi/[email protected]

diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile
@@ -2,17 +2,10 @@ ARG STAN_VERSION=0.15.1
 FROM nats-streaming:$STAN_VERSION
 
 # build stage
-<<<<<<< HEAD
 FROM golang:1.13-alpine3.11 AS build-env
 RUN apk --no-cache add build-base git mercurial gcc
 RUN cd src && go get -d github.com/nats-io/stan.go/
 RUN cd src/github.com/nats-io/stan.go/examples/stan-bench && git checkout tags/v0.5.2 && go build .
-=======
-FROM golang:1.20.7 AS build-env
-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 .
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 # create an enhanced container with nc command available since nats is based
 # on scratch image making healthcheck impossible