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.

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 docker-build target #5023

Merged
merged 2 commits into from
Jan 4, 2022
Merged

Conversation

matej-g
Copy link
Collaborator

@matej-g matej-g commented Jan 3, 2022

Signed-off-by: Matej Gera matejgera@gmail.com

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

Fixed the docker-build target, which currently fails always with:

Sending build context to Docker daemon  295.7MB
Step 1/7 : ARG BASE_DOCKER_SHA="97a9aacc097e5dbdec33b0d671adea0785e76d26ff2b979ee28570baf6a9155d"
Step 2/7 : FROM quay.io/prometheus/busybox@sha256:${BASE_DOCKER_SHA}
invalid reference format
make: *** [Makefile:190: docker-build-amd64] Error 1

Presumably caused as a side-effect of #4965. This PR fixes the target to correctly obtain the relevant SHA.

This currently causes publish_main job to fail as well, meaning no images are being published.

Verification

Run docker-build locally and was able to get pass the problematic step.

Signed-off-by: Matej Gera <matejgera@gmail.com>
wiardvanrij
wiardvanrij previously approved these changes Jan 3, 2022
Copy link
Member

@wiardvanrij wiardvanrij left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, good catch :D

Makefile Outdated Show resolved Hide resolved
Signed-off-by: Matej Gera <matejgera@gmail.com>
Copy link
Member

@kakkoyun kakkoyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kakkoyun kakkoyun merged commit 5cf91a0 into thanos-io:main Jan 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants