Skip to content

Commit

Permalink
Add support for HTTP_PROXY, HTTPS_PROXY env variables in the Otterize…
Browse files Browse the repository at this point in the history
… Cloud client & telemetry client
  • Loading branch information
orishoshan committed Apr 28, 2024
1 parent 3515f31 commit b5acc33
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build/kafka-watcher.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.21-alpine as buildenv
FROM --platform=$BUILDPLATFORM golang:1.22-alpine as buildenv
RUN apk add --no-cache ca-certificates git protoc
RUN apk add build-base libpcap-dev
WORKDIR /src
Expand Down
2 changes: 1 addition & 1 deletion build/mapper.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.21-alpine as buildenv
FROM --platform=$BUILDPLATFORM golang:1.22-alpine as buildenv
RUN apk add --no-cache ca-certificates git protoc
RUN apk add build-base libpcap-dev
WORKDIR /src
Expand Down
4 changes: 2 additions & 2 deletions build/sniffer.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 golang:1.21-alpine as buildenv
FROM --platform=linux/amd64 golang:1.22-alpine as buildenv
RUN apk add --no-cache ca-certificates git protoc
RUN apk add build-base libpcap-dev
WORKDIR /src
Expand All @@ -14,7 +14,7 @@ RUN go test ./sniffer/... && echo dep > /dep

# We start from the base image again, only this time it's using the target arch instead of always amd64. This is done to make the build faster.
# Unlike the mapper, it can't be amd64 throughout and use Go's cross-compilation, since the sniffer depends on libpcap (C library).
FROM golang:1.21-alpine as builder
FROM golang:1.22-alpine as builder
COPY --from=test /dep /dep
RUN apk add --no-cache ca-certificates git protoc
RUN apk add build-base libpcap-dev
Expand Down
8 changes: 3 additions & 5 deletions src/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b5acc33

Please sign in to comment.