Merge pull request #760 from SkynetLabs/cleanup-and-upgrades
Cleanup and upgrades
This commit is contained in:
commit
35efb88af7
|
@ -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
|
# available dns resolvers: https://github.com/caddy-dns
|
||||||
RUN xcaddy build --with github.com/caddy-dns/route53
|
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
|
COPY --from=caddy-builder /usr/bin/caddy /usr/bin/caddy
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM node:16.0.0-alpine
|
FROM node:16.1.0-alpine
|
||||||
|
|
||||||
WORKDIR /opt/hsd
|
WORKDIR /opt/hsd
|
||||||
|
|
||||||
|
|
|
@ -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 apt-get update -qq && apt-get install cron logrotate -qq
|
||||||
RUN luarocks install luasocket
|
RUN luarocks install luasocket
|
||||||
|
|
|
@ -158,7 +158,7 @@ server {
|
||||||
|
|
||||||
access_log off; # do not log traffic to health-check endpoint
|
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 {
|
location /hns {
|
||||||
|
@ -528,7 +528,7 @@ server {
|
||||||
proxy_cache_valid 200 401 1m; # cache success and unauthorized responses for 1 minute
|
proxy_cache_valid 200 401 1m; # cache success and unauthorized responses for 1 minute
|
||||||
|
|
||||||
rewrite /accounts(.*) $1 break; # drop the /accounts prefix from uri
|
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
|
# include custom locations, specific to the server
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM node:16.0.0-alpine
|
FROM node:16.1.0-alpine
|
||||||
|
|
||||||
WORKDIR /usr/app
|
WORKDIR /usr/app
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM node:16.0.0-alpine
|
FROM node:16.1.0-alpine
|
||||||
|
|
||||||
WORKDIR /usr/app
|
WORKDIR /usr/app
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM node:16.0.0-alpine
|
FROM node:16.1.0-alpine
|
||||||
|
|
||||||
WORKDIR /usr/app
|
WORKDIR /usr/app
|
||||||
|
|
||||||
|
|
|
@ -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
|
RUN apk update && apk add autoconf automake libtool gcc make g++ zlib-dev file nasm util-linux
|
||||||
|
|
||||||
|
|
|
@ -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
|
RUN apk update && apk add autoconf automake build-base libtool nasm pkgconfig
|
||||||
|
|
||||||
|
|
Reference in New Issue