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

src/cmdlib.sh: Work-around for OpenShift 3.9 not including .git [#320] #324

Merged
merged 2 commits into from
Feb 6, 2019
Merged

src/cmdlib.sh: Work-around for OpenShift 3.9 not including .git [#320] #324

merged 2 commits into from
Feb 6, 2019

Conversation

darkmuggle
Copy link
Contributor

@darkmuggle darkmuggle commented Feb 6, 2019

This address #320 by allowing for Opendshift s2i builds to work in 3.9. Example:

      strategy:                                                                                                                        
        dockerStrategy:                                                                                                                
          env:                                                                                                                         
              - name: GIT_URL                                                                                                          
                value: https://github.com/coreos/coreos-assembler                                                                                          
              - name: GIT_REF                                                                                                          
                value: master
              - name: OPENSHIFT_GIT_HACK                                                                                               
                value: "TRUE"                                                                                                          
          from:                                                                                                                        
            kind: ImageStreamTag                                                                                                       
            name: fedora:29                                                                                                            

src/cmdlib.sh Outdated Show resolved Hide resolved
src/cmdlib.sh Outdated Show resolved Hide resolved
src/cmdlib.sh Outdated

# Openshift 3.9 does not expose the GIT Repo.
# See https://github.com/coreos/coreos-assembler/issues/320
# TODO: Remove this when https://github.com/openshift/source-to-image/issues/457
Copy link
Member

Choose a reason for hiding this comment

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

that issue is closed so maybe we need more guidance on when we can remove this (i.e. when based on Openshift XX with S2I YY)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The change logs are not really helpful on either Openshift or S2I. Still hunting...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It looks like version v1.0.6 of the Source-to-Image has the change However, I can't find which version of Openshift has that in the default ose-docker-builder container.

Copy link
Member

Choose a reason for hiding this comment

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

guess we could pull the container and find out

Copy link
Contributor Author

Choose a reason for hiding this comment

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

One would think so:

ben@porpentina:~ $ sudo podman run --rm -it openshift3/ose-docker-builder:v3.10.45-5 version
openshift-docker-build v3.10.45

That's not the case.

Ben Howard added 2 commits February 6, 2019 14:04
For git commands that treat failures as "unknown", this hides the
error message itself.
@cgwalters
Copy link
Member

LGTM!

@cgwalters cgwalters merged commit 9e05181 into coreos:master Feb 6, 2019
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.

4 participants