-
Notifications
You must be signed in to change notification settings - Fork 825
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #693 from mozilla/develop
v3.6.0 RC (develop -> master)
- Loading branch information
Showing
39 changed files
with
2,189 additions
and
602 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
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,3 @@ | ||
/.git | ||
/Dockerfile | ||
/Dockerfile.alpine |
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,3 +1,5 @@ | ||
target | ||
Cargo.lock | ||
vendor/ | ||
coverage.txt | ||
profile.out |
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,2 +1,4 @@ | ||
creation_rules: | ||
- pgp: 1022470DE3F0BC54BC6AB62DE05550BC07FB1A0A | ||
- pgp: >- | ||
FBC7B9E2A4F9289AC0C1D4843D16CEE4A27381B4, | ||
D7229043384BCC60326C6FB9D8720D957C3D3074 |
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 |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM golang:1.12 | ||
FROM golang:1.14 | ||
|
||
COPY . /go/src/go.mozilla.org/sops | ||
WORKDIR /go/src/go.mozilla.org/sops | ||
|
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,17 @@ | ||
FROM golang:1.12-alpine3.10 AS builder | ||
|
||
RUN apk --no-cache add make | ||
|
||
COPY . /go/src/go.mozilla.org/sops | ||
WORKDIR /go/src/go.mozilla.org/sops | ||
|
||
RUN CGO_ENABLED=1 make install | ||
|
||
|
||
FROM alpine:3.10 | ||
|
||
RUN apk --no-cache add \ | ||
vim ca-certificates | ||
ENV EDITOR vim | ||
COPY --from=builder /go/bin/sops /usr/local/bin/sops | ||
ENTRYPOINT ["/usr/local/bin/sops"] |
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
Oops, something went wrong.