From 1e9b22977a132e0c2c6e2615bdbbe2ce9474bef5 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 13 May 2021 12:21:23 +0200 Subject: [PATCH 1/5] upgrade caddy to 2.4.0 --- docker/caddy/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/caddy/Dockerfile b/docker/caddy/Dockerfile index d870f1f9..83b497e3 100644 --- a/docker/caddy/Dockerfile +++ b/docker/caddy/Dockerfile @@ -1,8 +1,8 @@ -FROM caddy:2.3.0-builder AS caddy-builder +FROM caddy:2.4.0-builder AS caddy-builder # available dns resolvers: https://github.com/caddy-dns RUN xcaddy build --with github.com/caddy-dns/route53 -FROM caddy:2.3.0 +FROM caddy:2.4.0 COPY --from=caddy-builder /usr/bin/caddy /usr/bin/caddy From dbbff224d9031483d485cc5c77aff426fe1fecb4 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 13 May 2021 12:23:03 +0200 Subject: [PATCH 2/5] upgrade openresty image --- docker/nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index bba36f7b..a0abc542 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM openresty/openresty:1.19.3.1-2-bionic +FROM openresty/openresty:1.19.3.1-8-bionic # RUN apt-get update -qq && apt-get install cron logrotate -qq RUN luarocks install luasocket From d2694c82d3a5effc05117bed08d202298147ce79 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 13 May 2021 12:23:46 +0200 Subject: [PATCH 3/5] hardcode health-check ip in nginx --- docker/nginx/conf.d/client.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nginx/conf.d/client.conf b/docker/nginx/conf.d/client.conf index 63c92812..cce0810b 100644 --- a/docker/nginx/conf.d/client.conf +++ b/docker/nginx/conf.d/client.conf @@ -158,7 +158,7 @@ server { access_log off; # do not log traffic to health-check endpoint - proxy_pass http://health-check:3100; + proxy_pass http://10.10.10.60:3100; # hardcoded ip because health-check waits for nginx } location /hns { From 86225c808249ad1e5622c64ea21e901583e1005c Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 13 May 2021 12:25:48 +0200 Subject: [PATCH 4/5] hardcode accounts ip so nginx doesn't die if accounts are not present --- docker/nginx/conf.d/client.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nginx/conf.d/client.conf b/docker/nginx/conf.d/client.conf index cce0810b..c0942fba 100644 --- a/docker/nginx/conf.d/client.conf +++ b/docker/nginx/conf.d/client.conf @@ -528,7 +528,7 @@ server { proxy_cache_valid 200 401 1m; # cache success and unauthorized responses for 1 minute rewrite /accounts(.*) $1 break; # drop the /accounts prefix from uri - proxy_pass http://accounts:3000; + proxy_pass http://10.10.10.70:3000; # hardcoded ip because accounts might not be available } # include custom locations, specific to the server From 0dce2218d2d274bc7deda2af071b94d28159af3d Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 13 May 2021 12:30:35 +0200 Subject: [PATCH 5/5] upgrade node --- docker/handshake/Dockerfile | 2 +- packages/dashboard/Dockerfile | 2 +- packages/handshake-api/Dockerfile | 2 +- packages/health-check/Dockerfile | 2 +- packages/webapp/Dockerfile | 2 +- packages/website/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/handshake/Dockerfile b/docker/handshake/Dockerfile index 08d53c99..7a70744e 100644 --- a/docker/handshake/Dockerfile +++ b/docker/handshake/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.0.0-alpine +FROM node:16.1.0-alpine WORKDIR /opt/hsd diff --git a/packages/dashboard/Dockerfile b/packages/dashboard/Dockerfile index 001f0762..ef127a60 100644 --- a/packages/dashboard/Dockerfile +++ b/packages/dashboard/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.0.0-alpine +FROM node:16.1.0-alpine WORKDIR /usr/app diff --git a/packages/handshake-api/Dockerfile b/packages/handshake-api/Dockerfile index d87640c6..a8e19c50 100644 --- a/packages/handshake-api/Dockerfile +++ b/packages/handshake-api/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.0.0-alpine +FROM node:16.1.0-alpine WORKDIR /usr/app diff --git a/packages/health-check/Dockerfile b/packages/health-check/Dockerfile index 4bcd99b7..dcae0b1b 100644 --- a/packages/health-check/Dockerfile +++ b/packages/health-check/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.0.0-alpine +FROM node:16.1.0-alpine WORKDIR /usr/app diff --git a/packages/webapp/Dockerfile b/packages/webapp/Dockerfile index 2a8ad43f..3354f7a9 100644 --- a/packages/webapp/Dockerfile +++ b/packages/webapp/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.0.0-alpine +FROM node:16.1.0-alpine RUN apk update && apk add autoconf automake libtool gcc make g++ zlib-dev file nasm util-linux diff --git a/packages/website/Dockerfile b/packages/website/Dockerfile index 45c81bf2..9080bedb 100644 --- a/packages/website/Dockerfile +++ b/packages/website/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.0.0-alpine +FROM node:16.1.0-alpine RUN apk update && apk add autoconf automake build-base libtool nasm pkgconfig