-
Notifications
You must be signed in to change notification settings - Fork 45
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
Fixes #138 #158. Pull image before building image #159
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
See error like here: https://ci.centos.org/job/SCLo-container-python-rh-fedora/282/ |
I have tested this pulling function on s2i-base-container$ make test TARGET=fedora
Makefile:15: warning: overriding recipe for target 'core'
common/common.mk:81: warning: ignoring old recipe for target 'core'
make[1]: Entering directory '/vagrant/s2i-base-container'
Makefile:15: warning: overriding recipe for target 'core'
common/common.mk:81: warning: ignoring old recipe for target 'core'
VERSIONS="core" SKIP_SQUASH=1 UPDATE_BASE= OS=fedora CLEAN_AFTER= DOCKER_BUILD_CONTEXT=. OPENSHIFT_NAMESPACES="" CUSTOM_REPO="" /usr/bin/env bash common/build.sh
-> Version core: building image from 'Dockerfile.fedora' ...
-> Pulling image registry.fedoraproject.org/fedora:31 before building image from Dockerfile.fedora.
Trying to pull repository registry.fedoraproject.org/fedora ...
sha256:60cd711615e0983c533420634ba530283c14a26d875ab310964e2a5666ba957f: Pulling from registry.fedoraproject.org/fedora
c28ace6b0c4a: Retrying in 1 second
|
This commit fixes error in case of e.g. Fedora registry is not accessible for temporary reason like HTTP 503. Second pulling should work usually. Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
[test] |
pkubatrh
reviewed
Jul 23, 2020
pkubatrh
reviewed
Jul 23, 2020
Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
pkubatrh
reviewed
Jul 24, 2020
Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
[test] |
lgtm now, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[EDITED] This commit fixes an error in case of e.g. Fedora registry is not
accessible for a temporary reasons like HTTP 503.
Second pulling should work usually.
In case
FROM scratch
is used in Dockerfile then it is skipped.In case
FROM ubi8 as ubi-base
is used in Dockerfile theubi8
is pulled.Signed-off-by: Petr "Stone" Hracek phracek@redhat.com