Skip to content

Commit

Permalink
New Pebble version (#16)
Browse files Browse the repository at this point in the history
Allow to build from different remote as well.
  • Loading branch information
felixfontein authored and mattclay committed Sep 16, 2019
1 parent 099efe0 commit 7131155
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
15 changes: 11 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
FROM golang:1.12-stretch as builder
FROM golang:1.13-stretch as builder
# Install pebble
ARG PEBBLE_CHECKOUT="c65a2f3c2be48868db01363f32d1d99c77281946"
ARG PEBBLE_REMOTE=
ARG PEBBLE_CHECKOUT="7e026bbfe639ff65dbafacd1b4259a660a8c513f"
ENV GOPATH=/go
RUN go get -u github.com/letsencrypt/pebble/... && \
RUN go get -v -u github.com/letsencrypt/pebble/... && \
cd /go/src/github.com/letsencrypt/pebble && \
git checkout ${PEBBLE_CHECKOUT} && \
if [ "${PEBBLE_REMOTE}" != "" ]; then \
git remote add other ${PEBBLE_REMOTE} && \
git fetch other && \
git checkout -b other-${PEBBLE_CHECKOUT} --track other/${PEBBLE_CHECKOUT}; \
else \
git checkout ${PEBBLE_CHECKOUT}; \
fi && \
go install ./...

FROM python:3.6-slim-stretch
Expand Down
2 changes: 1 addition & 1 deletion controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ def get_root_certificate_pebble(index):
return urllib.request.urlopen("https://localhost:15000/roots/{0}".format(index), context=ctx).read()


@app.route('/intermediate-certificate-for-ca<int:index>')
@app.route('/intermediate-certificate-for-ca/<int:index>')
def get_intermediate_certificate_pebble(index):
ctx = ssl.create_default_context()
ctx.check_hostname = False
Expand Down

0 comments on commit 7131155

Please sign in to comment.