Skip to content

Commit

Permalink
Miscellaneous improvements to build and runtime (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
pires committed Jun 2, 2019
2 parents bd7c47f + 3bd40f8 commit fe379e5
Show file tree
Hide file tree
Showing 38 changed files with 861 additions and 1,644 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
.idea/
apiserver.local.config/
bin/
key.json
openapi_generated.go
pkg/client/
tmp/
vendor/
zz_generated.deepcopy.go
11 changes: 6 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM golang:1.12.5 AS builder
RUN go get -u github.com/golang/dep/cmd/dep
WORKDIR $GOPATH/src/github.com/travelaudience/aerospike-operator/
WORKDIR /src/aerospike-operator/
COPY go.mod go.sum ./
RUN go mod download
COPY hack/tools/go.mod hack/tools/go.sum ./hack/tools/
RUN cd ./hack/tools/ && go mod download
COPY . .
RUN make build BIN=operator OUT=/aerospike-operator

FROM alpine:3.9

RUN apk add -U ca-certificates
FROM gcr.io/distroless/static
COPY --from=builder /aerospike-operator /usr/local/bin/aerospike-operator
CMD ["aerospike-operator", "-h"]
4 changes: 0 additions & 4 deletions Dockerfile.skaffold.e2e

This file was deleted.

9 changes: 6 additions & 3 deletions Dockerfile.tools
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
FROM golang:1.10.1 AS builder
RUN go get -u github.com/golang/dep/cmd/dep
WORKDIR $GOPATH/src/github.com/travelaudience/aerospike-operator/
FROM golang:1.12.5 AS builder
WORKDIR /src/aerospike-operator/
COPY go.mod go.sum ./
RUN go mod download
COPY hack/tools/go.mod hack/tools/go.sum ./hack/tools/
RUN cd ./hack/tools/ && go mod download
COPY . .
RUN make build BIN=backup OUT=/backup
RUN make build BIN=asinit OUT=/asinit
Expand Down
Loading

0 comments on commit fe379e5

Please sign in to comment.