From 4fa08f5f2d22f1de728621d34f3c2ef9398de318 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Fri, 7 Sep 2018 15:27:07 +0200
Subject: [PATCH] fix merge for fix-dynamic-tls

---
 boring-nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index e64365f..d2abff6 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -83,7 +83,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
  && if [ "${FINGERPRINT}" != "${GPG_NGINX}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
  && echo "All seems good, now unpacking ${NGINX_TARBALL}..." \
  && tar xzf ${NGINX_TARBALL} && cd nginx-${NGINX_VERSION} \
- && wget -q https://raw.githubusercontent.com/hoellen/dockerfiles/fix-dynamic-tls/boring-nginx/dynamic_records.patch -O dynamic_records.patch \
+ && wget -q https://raw.githubusercontent.com/hoellen/dockerfiles/master/boring-nginx/dynamic_records.patch -O dynamic_records.patch \
  && patch -p1 < dynamic_records.patch \
  && ./configure \
     --prefix=/etc/nginx \