Make local registry address configurable#853
Merged
hardys merged 1 commit intoopenshift-metal3:masterfrom Nov 20, 2019
Merged
Conversation
yprokule
reviewed
Nov 20, 2019
| fi | ||
|
|
||
| if env | grep -q "_LOCAL_IMAGE=" ; then | ||
| export LOCAL_REGISTRY_ADDRESS = ${LOCAL_REGISTRY_ADDRESS:-"192.168.111.1:5000"} |
Contributor
There was a problem hiding this comment.
Extra spaces
Suggested change
| export LOCAL_REGISTRY_ADDRESS = ${LOCAL_REGISTRY_ADDRESS:-"192.168.111.1:5000"} | |
| export LOCAL_REGISTRY_ADDRESS=${LOCAL_REGISTRY_ADDRESS:-"192.168.111.1:5000"} |
yprokule
reviewed
Nov 20, 2019
| fi | ||
|
|
||
| if env | grep -q "_LOCAL_IMAGE=" ; then | ||
| export LOCAL_REGISTRY_ADDRESS = ${LOCAL_REGISTRY_ADDRESS:-"192.168.111.1:5000"} |
Contributor
There was a problem hiding this comment.
IMHO LOCAL_REGISTRY_ADDRESS shouldn't be exported within condition.
Being exported in outer block would allow images' mirroring(pr #850) not rely on presence of *_LOCAL_IMAGE variables, wdyt?
There was a problem hiding this comment.
Yeah agreed, and I think the changes in 04_setup_ironic.sh will break without this unless *_LOCAL_IMAGE is specified
hardys
reviewed
Nov 20, 2019
| #export IRONIC_INSPECTOR_LOCAL_IMAGE=https://github.com/metal3-io/ironic-inspector-image | ||
| #export IRONIC_RHCOS_DOWNLOADER_LOCAL_IMAGE=https://github.com/openshift-metal3/rhcos-downloader | ||
| #export BAREMETAL_OPERATOR_LOCAL_IMAGE=192.168.111.1:5000/localimages/bmo:latest | ||
| #export BAREMETAL_OPERATOR_LOCAL_IMAGE=$LOCAL_REGISTRY_ADDRESS/localimages/bmo:latest |
There was a problem hiding this comment.
This is just an example comment showing how to set this in config_$USER.sh, where common.sh isn't necessarily souurced, so maybe we should leave this one as-is?
Or, in other words, let's not hardcode it anymore
honza
force-pushed
the
local-registry
branch
from
330ea6f to
82a7131
Compare
yprokule
approved these changes
Nov 20, 2019
|
Build SUCCESS, see build http://10.8.144.11:8080/job/dev-tools/1317/ |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Or, in other words, let's not hardcode it anymore