Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix generator docker image build #952

Merged
merged 1 commit into from
Aug 17, 2023
Merged

Fix generator docker image build #952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,12 @@ jobs:
- run: make generate
- run: diff -u ../snmp.yml snmp.yml

publish_generator_master:
publish_generator_main:
executor: golang

steps:
- prometheus/setup_environment
- prometheus/setup_build_environment:
docker_version: ""
- run: make -C generator docker
- run: make -C generator docker DOCKER_REPO=quay.io/prometheus
- run: docker images
Expand All @@ -64,7 +65,8 @@ jobs:
executor: golang

steps:
- prometheus/setup_environment
- prometheus/setup_build_environment:
docker_version: ""
- run: make -C generator docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
- run: make -C generator docker DOCKER_IMAGE_TAG=$CIRCLE_TAG DOCKER_REPO=quay.io/prometheus
- run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
Expand Down Expand Up @@ -107,15 +109,15 @@ workflows:
filters:
tags:
only: /.*/
- prometheus/publish_master:
- prometheus/publish_main:
context: org-context
requires:
- test
- build
- generator
filters:
branches:
only: master
only: main
- prometheus/publish_release:
context: org-context
requires:
Expand All @@ -127,15 +129,15 @@ workflows:
only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
branches:
ignore: /.*/
- publish_generator_master:
- publish_generator_main:
context: org-context
requires:
- test
- build
- generator
filters:
branches:
only: master
only: main
- publish_generator_release:
context: org-context
requires:
Expand Down