Skip to content

Commit

Permalink
Merge pull request #24 from layer5io/kumarabd/feature/model
Browse files Browse the repository at this point in the history
changed base image
  • Loading branch information
leecalcote authored Jan 18, 2021
2 parents 790f16f + 7bdc944 commit a2265e5
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 287 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o meshery-

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/base
FROM gcr.io/distroless/base-debian10
WORKDIR /
ENV GODISTRO="debian"
ENV GOARCH="amd64"
Expand Down
27 changes: 21 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module github.com/layer5io/meshsync

replace (
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f
golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6
vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
Expand All @@ -9,22 +10,36 @@ replace (
go 1.13

require (
github.com/fatih/color v1.10.0 // indirect
github.com/go-logr/logr v0.3.0 // indirect
github.com/golang/protobuf v1.4.3
github.com/golangci/golangci-lint v1.33.0 // indirect
github.com/google/go-cmp v0.5.2 // indirect
github.com/google/uuid v1.1.2
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.9 // indirect
github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/layer5io/meshery-adapter-library v0.1.9
github.com/layer5io/meshery-operator v0.2.0
github.com/layer5io/meshkit v0.1.32
github.com/layer5io/meshkit v0.2.0
github.com/myntra/pipeline v0.0.0-20180618182531-2babf4864ce8
github.com/nats-io/nats.go v1.10.0
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/onsi/ginkgo v1.14.2 // indirect
github.com/onsi/gomega v1.10.4 // indirect
github.com/prometheus/procfs v0.0.11 // indirect
github.com/rogpeppe/go-internal v1.6.1 // indirect
github.com/sirupsen/logrus v1.7.0 // indirect
github.com/spf13/cobra v1.1.1 // indirect
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/grpc v1.34.0
google.golang.org/protobuf v1.25.0
gorm.io/driver/sqlite v1.1.4 // indirect
gorm.io/gorm v1.20.10
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
istio.io/client-go v1.8.1
k8s.io/api v0.18.12
k8s.io/apimachinery v0.18.12
k8s.io/client-go v0.18.12
sigs.k8s.io/controller-runtime v0.6.4
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 // indirect
)
Loading

0 comments on commit a2265e5

Please sign in to comment.