diff --git a/.gitignore b/.gitignore index 1c0baf5..43cda17 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ cert/ +certs/ diff --git a/images/gotls13-p1/Dockerfile b/images/gotls13-p1/Dockerfile index 3cabac2..53495f8 100644 --- a/images/gotls13-p1/Dockerfile +++ b/images/gotls13-p1/Dockerfile @@ -2,7 +2,7 @@ FROM buildpack-deps EXPOSE 443 -#ADD cert/privkey.pem / -#ADD cert/fullchain.pem / +ADD certs/privkey.pem / +ADD certs/fullchain.pem / ADD bin/server / -CMD [ "/server", "-b", "0.0.0.0:443" ] +CMD [ "/server", "-b", "0.0.0.0:443", "-cert", "/privkey.pem:/fullchain.pem" ] diff --git a/images/gotls13-p1/Makefile b/images/gotls13-p1/Makefile index 804ebea..26d5ca1 100644 --- a/images/gotls13-p1/Makefile +++ b/images/gotls13-p1/Makefile @@ -1,8 +1,15 @@ NAME=gotls13-p1 build: + mkdir -p certs + cp ../../cert/fullchain.pem certs/ + cp ../../cert/privkey.pem certs/ docker build -t ${NAME} . run: docker run --detach --restart always --name ${NAME} -p 50600:443 ${NAME} restart: - docker restart ${NAME} + docker stop ${NAME} + docker rm ${NAME} + docker run --detach --restart always --name ${NAME} -p 50600:443 ${NAME} + + diff --git a/images/gotls13-p1/bin/server b/images/gotls13-p1/bin/server index 3df0503..e1d7df7 100755 Binary files a/images/gotls13-p1/bin/server and b/images/gotls13-p1/bin/server differ diff --git a/images/pq-t1/Dockerfile b/images/pq-t1/Dockerfile index 303f5f5..c366dcf 100644 --- a/images/pq-t1/Dockerfile +++ b/images/pq-t1/Dockerfile @@ -5,4 +5,4 @@ EXPOSE 443 #ADD cert/privkey.pem / #ADD cert/fullchain.pem / ADD bin/server / -CMD [ "/server", "-b", "0.0.0.0:443", "-enable_sidh" ] +CMD [ "/server", "-b", "0.0.0.0:443", "-qr" ]