diff --git a/.circleci/config.yml b/.circleci/config.yml index ee03ff8d2..8615f171f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -81,20 +81,20 @@ workflows: only: /^(main|master|release-.*|.*build-all.*)$/ tags: only: /^v.*/ - - prometheus/publish_master: - context: org-context - docker_hub_organization: prometheuscommunity - quay_io_organization: prometheuscommunity - requires: - - test - - build_all - filters: - branches: - only: master + # - prometheus/publish_master: + # context: org-context + # docker_hub_organization: prometheuscommunity + # quay_io_organization: prometheuscommunity + # requires: + # - test + # - build_all + # filters: + # branches: + # only: master - prometheus/publish_release: - context: org-context - docker_hub_organization: prometheuscommunity - quay_io_organization: prometheuscommunity + context: org-global + docker_hub_organization: tetrate + # quay_io_organization: prometheuscommunity requires: - test - build_all diff --git a/Makefile b/Makefile index 114e3438f..7a95266bf 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ all:: # Needs to be defined before including Makefile.common to auto-generate targets DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le -DOCKER_REPO ?= prometheuscommunity +DOCKER_REPO ?= tetrate include Makefile.common diff --git a/README.md b/README.md index 01bd8b30d..5e6881d99 100644 --- a/README.md +++ b/README.md @@ -445,3 +445,12 @@ docker run -p 5432:5432 -e POSTGRES_DB=circle_test -e POSTGRES_USER=postgres -e # Run the integration tests DATA_SOURCE_NAME='postgresql://postgres:test@localhost:5432/circle_test?sslmode=disable' GOOPTS='-v -tags integration' make test ``` + +# **Tetrate CVE builds** +Upstream is not fixing CVEs reported by security scanners, but not applicable to postgres_exporter image. +These false positives can be fixed by cutting tetrate specific patch releases as follows: +- Push a commit to a release branch in our fork (e.g. `release-v0.18.1` branch) with the changes to fix the CVEs. + - In this PR, include changes to the `VERSION` file to the new version name following the pattern `-tetrate-v`. For example `v0.18.1-tetrate-v0` is the first CVEs fixing patch for `v0.18.1`. +- Once the PR is approved and merged: + - Create the tag and push it to the repository. + - CircleCI will automatically build the images and push them to the [tetrate docker hub repository](https://hub.docker.com/r/tetrate/postgres_exporter).