From 49ae9b0a69f5c470a8f048fcc87950b36d25c217 Mon Sep 17 00:00:00 2001 From: Amir Zarrinkafsh Date: Wed, 30 Dec 2020 07:23:24 +1100 Subject: [PATCH] [CI] Update QEMU to v5.2.0-1 (#1567) * [CI] Update QEMU to v5.2.0-1 * Fix linting error from golangci-lint 1.34.1 update Co-authored-by: James Elliott --- cmd/authelia-scripts/cmd_docker.go | 2 +- cmd/authelia-scripts/main.go | 2 +- internal/configuration/validator/configuration.go | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/authelia-scripts/cmd_docker.go b/cmd/authelia-scripts/cmd_docker.go index a8d26ecfe..daddc5347 100644 --- a/cmd/authelia-scripts/cmd_docker.go +++ b/cmd/authelia-scripts/cmd_docker.go @@ -46,7 +46,7 @@ func dockerBuildOfficialImage(arch string) error { // Set default Architecture Dockerfile to amd64. dockerfile := "Dockerfile" // Set version of QEMU. - qemuversion := "v5.1.0-7" + qemuversion := "v5.2.0-1" // If not the default value. if arch != defaultArch { diff --git a/cmd/authelia-scripts/main.go b/cmd/authelia-scripts/main.go index 213595224..ec1a29d05 100755 --- a/cmd/authelia-scripts/main.go +++ b/cmd/authelia-scripts/main.go @@ -1,5 +1,5 @@ //usr/bin/env go run "$0" "$@"; exit -//nolint:gocritic,godot +//nolint:gocritic package main diff --git a/internal/configuration/validator/configuration.go b/internal/configuration/validator/configuration.go index e3adab6ce..998903428 100644 --- a/internal/configuration/validator/configuration.go +++ b/internal/configuration/validator/configuration.go @@ -11,7 +11,6 @@ var defaultPort = 8080 var defaultLogLevel = "info" // ValidateConfiguration and adapt the configuration read from file. -//nolint:gocyclo // This function is likely to always have lots of if/else statements, as long as we keep the flow clean it should be understandable. func ValidateConfiguration(configuration *schema.Configuration, validator *schema.StructValidator) { if configuration.Host == "" { configuration.Host = "0.0.0.0"