-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* upgrade Go to 1.20.5 * ignore known issue with go tool cover * capture cover output and check it for errors * debug * wip * move ragel files to root directory the //line directives used to point to the original "ragel" files were creating problems for the coverage tool. They were being reported without the 'parser/' directory. Causing the go tool cover to look for the wrong files and therefore failing. Moving it all to the root directory fixes the problem. * upgrade to go1.20.6 * . * Revert "move ragel files to root directory" This reverts commit 2b6a159. * remove debug * disable //line directives * goimport (cherry picked from commit a278734) # Conflicts: # .go-version # .golangci.yml # Vagrantfile # auditbeat/Dockerfile # dev-tools/kubernetes/filebeat/Dockerfile.debug # dev-tools/kubernetes/heartbeat/Dockerfile.debug # dev-tools/kubernetes/metricbeat/Dockerfile.debug # dev-tools/mage/gotest.go # filebeat/input/syslog/rfc5424_parser.go # heartbeat/Dockerfile # libbeat/docs/version.asciidoc # libbeat/reader/syslog/rfc3164_test.go # libbeat/reader/syslog/rfc5424_test.go # metricbeat/Dockerfile # metricbeat/module/http/_meta/Dockerfile # metricbeat/module/nats/_meta/Dockerfile # packetbeat/Dockerfile # x-pack/functionbeat/Dockerfile # x-pack/metricbeat/module/stan/_meta/Dockerfile
- Loading branch information
1 parent
69b29de
commit 65bd306
Showing
23 changed files
with
918 additions
and
181 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,5 @@ | ||
<<<<<<< HEAD | ||
1.19.12 | ||
======= | ||
1.20.6 | ||
>>>>>>> a278734f11 (upgrade Go to 1.20.6 (#36000)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
FROM golang:1.20.6 as builder | ||
|
||
ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin | ||
|
||
ENV CGO_ENABLED=0 | ||
|
||
RUN go install github.com/go-delve/delve/cmd/[email protected] | ||
|
||
COPY build/filebeat-debugger /usr/share/filebeat/filebeat-debugger | ||
|
||
FROM alpine:3.15 | ||
|
||
ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin | ||
|
||
WORKDIR /usr/share/filebeat | ||
|
||
COPY --from=builder /go/bin/dlv /go/bin/dlv | ||
COPY --from=builder /usr/share/filebeat/filebeat-debugger /usr/share/filebeat/filebeat-debugger | ||
|
||
ENTRYPOINT ["dlv", "--headless", "--listen=:56268", "--api-version=2", "--log", "--log-output", "debugger", "exec", "/usr/share/filebeat/filebeat-debugger", "--"] | ||
CMD [ "-e" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
FROM golang:1.20.6 as builder | ||
|
||
ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin | ||
|
||
ENV CGO_ENABLED=0 | ||
|
||
RUN go install github.com/go-delve/delve/cmd/[email protected] | ||
|
||
COPY build/heartbeat-debugger /usr/share/heartbeat/heartbeat-debugger | ||
|
||
FROM alpine:3.16 | ||
|
||
ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin | ||
|
||
WORKDIR /usr/share/heartbeat | ||
|
||
COPY --from=builder /go/bin/dlv /go/bin/dlv | ||
COPY --from=builder /usr/share/heartbeat/heartbeat-debugger /usr/share/heartbeat/heartbeat-debugger | ||
|
||
ENTRYPOINT ["dlv", "--headless", "--listen=:56268", "--api-version=2", "--log", "--log-output", "debugger", "exec", "/usr/share/heartbeat/heartbeat-debugger", "--"] | ||
CMD [ "-e" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
FROM golang:1.20.6 as builder | ||
|
||
ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin | ||
|
||
ENV CGO_ENABLED=0 | ||
|
||
RUN go install github.com/go-delve/delve/cmd/[email protected] | ||
|
||
COPY build/metricbeat-debugger /usr/share/metricbeat/metricbeat-debugger | ||
|
||
FROM alpine:3.15 | ||
|
||
ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin | ||
|
||
WORKDIR /usr/share/metricbeat | ||
|
||
COPY --from=builder /go/bin/dlv /go/bin/dlv | ||
COPY --from=builder /usr/share/metricbeat/metricbeat-debugger /usr/share/metricbeat/metricbeat-debugger | ||
|
||
ENTRYPOINT ["dlv", "--headless", "--listen=:56268", "--api-version=2", "--log", "--log-output", "debugger", "exec", "/usr/share/metricbeat/metricbeat-debugger", "--"] | ||
CMD [ "-e" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.