From 4df4c741336608059a8ded2a36a018ab284c655e Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Tue, 25 Aug 2015 00:10:07 +0200 Subject: [PATCH] Replaced Google PKI certificates --- Dockerfile | 2 +- Makefile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 45abe18..7f47c5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ EXPOSE 3000 ENTRYPOINT ["/cloudkeys-go"] CMD ["--storage=local:////data", "--password-salt=changeme", "--username-salt=changeme"] -ADD ./ca-certificates.pem /etc/ssl/ca-bundle.pem +ADD https://rootcastore.hub.luzifer.io/v1/store/latest /etc/ssl/ca-bundle.pem ADD ./cloudkeys-go /cloudkeys-go ADD ./templates /templates diff --git a/Makefile b/Makefile index a79ddc7..2ff924a 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ build: bundle_assets pre-commit: bundle_assets -container: ca-certificates.pem bundle_assets +container: bundle_assets docker run -v $(CURDIR):/src -e LDFLAGS='-X main.version $(VERSION)' centurylink/golang-builder:latest docker build . @@ -19,7 +19,3 @@ gen_js: bundle_assets: gen_css gen_js go-bindata assets templates - -ca-certificates.pem: - curl -s https://pki.google.com/roots.pem | grep -v "^#" | grep -v "^$$" > $@ - shasum $@