Skip to content

Commit

Permalink
Upgrade dependencies (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
ramanan-ravi authored Jan 5, 2023
1 parent b3f9473 commit 9aed5a1
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 56 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18-alpine3.15 AS builder
FROM golang:1.19-alpine3.17 AS builder
MAINTAINER DeepFence

RUN apk update \
Expand All @@ -8,25 +8,25 @@ ENV PKG_CONFIG_PATH=/usr/local/include/hs/ \
CGO_CFLAGS="-I/usr/local/include/hyperscan/src" \
LD_LIBRARY_PATH=/usr/local/lib:/usr/local/include/hs/lib:$LD_LIBRARY_PATH

RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1 \
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1 \
&& go install google.golang.org/grpc/cmd/[email protected]

WORKDIR /home/deepfence/src/SecretScanner
COPY . .
RUN make clean
RUN make

FROM alpine:3.15
FROM alpine:3.17
MAINTAINER DeepFence
LABEL deepfence.role=system

ENV MGMT_CONSOLE_URL=deepfence-internal-router \
MGMT_CONSOLE_PORT=443
RUN apk update && apk add --no-cache --upgrade curl tar libstdc++ libgcc docker skopeo python3 py3-pip bash podman \
&& apk add hyperscan --repository=https://dl-cdn.alpinelinux.org/alpine/v3.13/community \
&& curl -fsSLOk https://github.com/containerd/nerdctl/releases/download/v0.23.0/nerdctl-0.23.0-linux-amd64.tar.gz \
&& tar Cxzvvf /usr/local/bin nerdctl-0.23.0-linux-amd64.tar.gz \
&& rm nerdctl-0.23.0-linux-amd64.tar.gz \
&& curl -fsSLOk https://github.com/containerd/nerdctl/releases/download/v1.1.0/nerdctl-1.1.0-linux-amd64.tar.gz \
&& tar Cxzvvf /usr/local/bin nerdctl-1.1.0-linux-amd64.tar.gz \
&& rm nerdctl-1.1.0-linux-amd64.tar.gz \
&& apk del curl
WORKDIR /home/deepfence/usr
COPY --from=builder /home/deepfence/src/SecretScanner/SecretScanner .
Expand Down
2 changes: 1 addition & 1 deletion agent-plugins-grpc
30 changes: 15 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ replace github.com/deepfence/agent-plugins-grpc => ./agent-plugins-grpc
require (
github.com/Jeffail/tunny v0.1.4
github.com/deepfence/agent-plugins-grpc v0.0.0-00010101000000-000000000000
github.com/deepfence/vessel v0.8.1
github.com/deepfence/vessel v0.9.0
github.com/fatih/color v1.13.0
github.com/flier/gohs v1.2.0
google.golang.org/grpc v1.50.1
github.com/flier/gohs v1.2.1
google.golang.org/grpc v1.51.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/Microsoft/hcsshim v0.9.4 // indirect
github.com/containerd/cgroups v1.0.3 // indirect
github.com/containerd/containerd v1.6.8 // indirect
github.com/containerd/continuity v0.2.2 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Microsoft/hcsshim v0.9.6 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
github.com/containerd/containerd v1.6.14 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/containerd/fifo v1.0.0 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
github.com/containerd/typeurl v1.0.2 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v20.10.18+incompatible // indirect
github.com/docker/docker v20.10.22+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/docker/go-units v0.4.0 // indirect
Expand All @@ -47,10 +47,10 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/protobuf v1.27.1 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/protobuf v1.28.0 // indirect
)
Loading

0 comments on commit 9aed5a1

Please sign in to comment.