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

buildah: restore exclusion of "FROM oci-archive:" #1436

Merged
merged 1 commit into from
Sep 23, 2024

Conversation

owtaylor
Copy link
Contributor

Commit f12435b (Replace grep base images parsing with dockerfile-json) accidentally reverted fdc3d9c (buildah: Don't include oci-archive: FROM lines in BASE_IMAGES)

Original commit message:

In certain cases, we might have a FROM line which is from an archive
exported by a pevious build stage; when we are pre-pulling images
for a hermetic build, skip these images.

(Even if the oci-archive wasn't generated during the build, there's
no point in pre-pulling a local URL.)

See #1158

Commit f12435b (Replace grep base images parsing with
dockerfile-json) accidentally reverted fdc3d9c
(buildah: Don't include oci-archive: FROM lines in BASE_IMAGES)

Original commit message:

    In certain cases, we might have a FROM line which is from an archive
    exported by a pevious build stage; when we are pre-pulling images
    for a hermetic build, skip these images.

    (Even if the oci-archive wasn't generated during the build, there's
    no point in pre-pulling a local URL.)

See konflux-ci#1158

Signed-off-by: Owen W. Taylor <[email protected]>
@chmeliik
Copy link
Contributor

/ok-to-test

@chmeliik chmeliik enabled auto-merge September 18, 2024 07:51
@chmeliik
Copy link
Contributor

/retest

@chmeliik chmeliik added this pull request to the merge queue Sep 18, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 18, 2024
@chmeliik
Copy link
Contributor

/retest

@chmeliik chmeliik added this pull request to the merge queue Sep 23, 2024
Merged via the queue into konflux-ci:main with commit a45fed0 Sep 23, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants