Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update some package dependencies #30

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update some package dependencies #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4bc646
remove whitespace from P11_PIN_FILE
hoskeri Oct 1, 2020
01d1a0f
Clean up container package list.
hoskeri Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ RUN go build -o k8s-kms-plugin ./cmd/k8s-kms-plugin

### Plugin Server
FROM ubuntu:20.04 as base-server
RUN apt-get update && apt-get install -y softhsm curl openssl libssl-dev && rm -rf /var/lib/apt/lists/
RUN apt-get update && \
apt-get install -y softhsm curl openssl libcap2 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

## Runtime Server
FROM base-server as kms-server
Expand Down
7 changes: 3 additions & 4 deletions cmd/k8s-kms-plugin/cmd/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"os"
"path/filepath"
"strconv"
"strings"

"github.com/ThalesIgnite/crypto11"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -87,7 +88,8 @@ var serveCmd = &cobra.Command{
logrus.Error(err)
return
}
p11pin = string(p11pinBytes)
p11pin = strings.TrimSpace(string(p11pinBytes))

logrus.Infof("Loaded P11 PIN from file: %v", a)
} else if a := os.Getenv("P11_PIN"); a != "" {
p11pin = a
Expand Down Expand Up @@ -141,9 +143,6 @@ func init() {
serveCmd.Flags().StringVar(&serverTLSCert, "tls-certificate", "certs/tls.crt", "TLS server cert")
// Here you will define your flags and configuration settings.




serveCmd.Flags().BoolVar(&allowAny, "allow-any", false, "Allow any device (accepts all ids/secrets)")

}
Expand Down