Merge branches 'renovate/docker.io-joseluisq-static-web-server-2.x' and 'renovate/gcr.io-kaniko-project-executor-1.x'