diff --git a/.golangci.yml b/.golangci.yml index ac26e8a..8fb9483 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,11 +5,10 @@ linters-settings: gocritic: disabled-checks: - exitAfterDefer - gofumpt: - lang-version: "1.18" output: - format: colored-line-number + formats: + - format: colored-line-number print-issued-lines: true print-linter-name: true @@ -31,7 +30,7 @@ linters: - gocritic - gocyclo - godot - - goerr113 + - err113 - godox - nolintlint - misspell @@ -47,7 +46,6 @@ linters: - nakedret - prealloc - staticcheck - - exportloopref - stylecheck - typecheck - unconvert diff --git a/Dockerfile b/Dockerfile index a4312d1..0f4503a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-bullseye as builder +FROM golang:1.20-bullseye AS builder RUN mkdir /build ADD . /build/ @@ -6,7 +6,7 @@ WORKDIR /build RUN make build -FROM node:slim as ui-builder +FROM node:slim AS ui-builder RUN mkdir /build WORKDIR /build @@ -17,7 +17,7 @@ RUN npm ci --prefix ui/ ADD . /build/ RUN npm run build --prefix ui/ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN apt-get update \ && apt-get -y install curl gnupg2 git podman dumb-init \ && rm -rf /var/lib/apt/lists/* diff --git a/docker-compose.yml b/docker-compose.yml index b606f48..e95f5a7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: db: image: postgres:13.3