From 5b50b125bd5943bd34222dcbb0e2fde86c3e6fd5 Mon Sep 17 00:00:00 2001 From: yorickdowne <71337066+yorickdowne@users.noreply.github.com> Date: Wed, 28 Dec 2022 10:52:48 -0500 Subject: [PATCH] Update dasel dependency to 2.x (#1130) --- nethermind/Dockerfile.binary | 2 +- nethermind/Dockerfile.dev | 2 +- nethermind/Dockerfile.source | 2 +- nethermind/docker-entrypoint.sh | 19 ++++++++++--------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/nethermind/Dockerfile.binary b/nethermind/Dockerfile.binary index 6cdb59f1..cb96798b 100644 --- a/nethermind/Dockerfile.binary +++ b/nethermind/Dockerfile.binary @@ -1,6 +1,6 @@ ARG DOCKER_TAG -FROM ghcr.io/tomwright/dasel:v1.27.3-alpine as dasel +FROM ghcr.io/tomwright/dasel:v2.0.2-alpine as dasel FROM nethermind/nethermind:${DOCKER_TAG} diff --git a/nethermind/Dockerfile.dev b/nethermind/Dockerfile.dev index f63cb367..4d896399 100644 --- a/nethermind/Dockerfile.dev +++ b/nethermind/Dockerfile.dev @@ -1,6 +1,6 @@ ARG DOCKER_TAG -FROM ghcr.io/tomwright/dasel:v1.27.3-alpine as dasel +FROM ghcr.io/tomwright/dasel:v2.0.2-alpine as dasel FROM nethermindeth/nethermind:${DOCKER_TAG} diff --git a/nethermind/Dockerfile.source b/nethermind/Dockerfile.source index 0b58602d..471c3017 100644 --- a/nethermind/Dockerfile.source +++ b/nethermind/Dockerfile.source @@ -17,7 +17,7 @@ RUN bash -c "\ git submodule update --init --recursive && \ dotnet publish src/Nethermind/Nethermind.Runner -c release -o out" -FROM ghcr.io/tomwright/dasel:v1.27.3-alpine as dasel +FROM ghcr.io/tomwright/dasel:v2.0.2-alpine as dasel FROM mcr.microsoft.com/dotnet/aspnet:6.0 diff --git a/nethermind/docker-entrypoint.sh b/nethermind/docker-entrypoint.sh index 4b7f86f9..17f4067d 100755 --- a/nethermind/docker-entrypoint.sh +++ b/nethermind/docker-entrypoint.sh @@ -24,15 +24,16 @@ fi #sed -e "${LOG_LINE} i \ \\n" -i /nethermind/NLog.config #sed -e "${LOG_LINE} i \ " -i /nethermind/NLog.config #sed -e "${LOG_LINE} i \ " -i /nethermind/NLog.config -dasel put document -f /nethermind/NLog.config -p xml -d json 'nlog.rules.logger' '{"-name":"JsonWebAPI.Microsoft.Extensions.Diagnostics.HealthChecks.DefaultHealthCheckService","-maxlevel":"Error","-final":"true"}{"-name":"JsonWebAPI*","-minlevel":"Error","-writeTo":"file-async","-final":"true"}' -dasel put document -f /nethermind/NLog.config -p xml -d json 'nlog.rules.logger.[]' '{"-name":"JsonWebAPI*","-minlevel":"Error","-writeTo":"auto-colored-console-async","-final":"true"}' -dasel put document -f /nethermind/NLog.config -p xml -d json 'nlog.rules.logger.[]' '{"-name":"JsonWebAPI*","-final":"true"}' -dasel put document -f /nethermind/NLog.config -p xml -d json 'nlog.rules.logger.[]' '{"-name":"JsonRpc.*","-minlevel":"Warn","-writeTo":"file-async","-final":"true"}' -dasel put document -f /nethermind/NLog.config -p xml -d json 'nlog.rules.logger.[]' '{"-name":"JsonRpc.*","-minlevel":"Warn","-writeTo":"auto-colored-console-async","-final":"true"}' -dasel put document -f /nethermind/NLog.config -p xml -d json 'nlog.rules.logger.[]' '{"-name":"JsonRpc.*","-final":"true"}' -dasel put document -f /nethermind/NLog.config -p xml -d json 'nlog.rules.logger.[]' '{"-name":"*","-minlevel":"Off","-writeTo":"seq"}' -dasel put document -f /nethermind/NLog.config -p xml -d json 'nlog.rules.logger.[]' '{"-name":"*","-minlevel":"Info","-writeTo":"file-async"}' -dasel put document -f /nethermind/NLog.config -p xml -d json 'nlog.rules.logger.[]' '{"-name":"*","-minlevel":"Info","-writeTo":"auto-colored-console-async"}' +# dasel 2.x syntax +dasel put -f /nethermind/NLog.config -r xml -w xml -t json 'nlog.rules.logger' -v '{"-name":"JsonWebAPI.Microsoft.Extensions.Diagnostics.HealthChecks.DefaultHealthCheckService","-maxlevel":"Error","-final":"true"}{"-name":"JsonWebAPI*","-minlevel":"Error","-writeTo":"file-async","-final":"true"}' +dasel put -f /nethermind/NLog.config -r xml -w xml -t json 'nlog.rules.logger.[]' -v '{"-name":"JsonWebAPI*","-minlevel":"Error","-writeTo":"auto-colored-console-async","-final":"true"}' +dasel put -f /nethermind/NLog.config -r xml -w xml -t json 'nlog.rules.logger.[]' -v '{"-name":"JsonWebAPI*","-final":"true"}' +dasel put -f /nethermind/NLog.config -r xml -w xml -t json 'nlog.rules.logger.[]' -v '{"-name":"JsonRpc.*","-minlevel":"Warn","-writeTo":"file-async","-final":"true"}' +dasel put -f /nethermind/NLog.config -r xml -w xml -t json 'nlog.rules.logger.[]' -v '{"-name":"JsonRpc.*","-minlevel":"Warn","-writeTo":"auto-colored-console-async","-final":"true"}' +dasel put -f /nethermind/NLog.config -r xml -w xml -t json 'nlog.rules.logger.[]' -v '{"-name":"JsonRpc.*","-final":"true"}' +dasel put -f /nethermind/NLog.config -r xml -w xml -t json 'nlog.rules.logger.[]' -v '{"-name":"*","-minlevel":"Off","-writeTo":"seq"}' +dasel put -f /nethermind/NLog.config -r xml -w xml -t json 'nlog.rules.logger.[]' -v '{"-name":"*","-minlevel":"Info","-writeTo":"file-async"}' +dasel put -f /nethermind/NLog.config -r xml -w xml -t json 'nlog.rules.logger.[]' -v '{"-name":"*","-minlevel":"Info","-writeTo":"auto-colored-console-async"}' if [ -n "${JWT_SECRET}" ]; then echo -n "${JWT_SECRET}" > /var/lib/nethermind/ee-secret/jwtsecret