diff --git a/.aspell.yml b/.aspell.yml index 1e29970d..a37804e8 100644 --- a/.aspell.yml +++ b/.aspell.yml @@ -42,3 +42,5 @@ allowed: - namespaces - http - CORS + - dataplaneapi + - usr diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index dac5a5cd..f072594b 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: commit-policy - uses: docker://ghcr.io/haproxytech/commit-check:5.1.1 + uses: docker://ghcr.io/haproxytech/commit-check:5.2.0 env: API_TOKEN: ${{ secrets.GITHUB_TOKEN }} generate: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b04b29cd..b933682b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ commit-policy: rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' image: - name: $CI_REGISTRY_GO/commit-check:5.1.1 + name: $CI_REGISTRY_GO/commit-check:5.2.0 entrypoint: [""] tags: - go diff --git a/Makefile b/Makefile index cd618ccc..68c3d8f5 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ TARGETPLATFORM?=linux/amd64 GOOS?=linux GOARCH?=amd64 GOLANGCI_LINT_VERSION=1.64.5 -CHECK_COMMIT=5.0.4 +CHECK_COMMIT=5.2.0 .PHONY: test test: diff --git a/build/Dockerfile b/build/Dockerfile index b9535eff..c15974d9 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -43,6 +43,7 @@ COPY /fs / RUN apk --no-cache add socat openssl util-linux htop tzdata curl libcap && \ rm -f /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi /etc/haproxy/dataplaneapi.yml && \ + rm -f /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \ chgrp -R haproxy /usr/local/etc/haproxy /run /var && \ chmod -R ug+rwx /usr/local/etc/haproxy /run /var && \ setcap 'cap_net_bind_service=+ep' /usr/local/sbin/haproxy && \