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

Avoid git cloning from the deb6 image #6459

Merged
merged 1 commit into from
Feb 23, 2018

Conversation

tsg
Copy link
Contributor

@tsg tsg commented Feb 23, 2018

It seems that by now Debian 6 is so old that git clone from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as a zip file.

Tested make package locally.

@tsg
Copy link
Contributor Author

tsg commented Feb 23, 2018

The longer term plan is to reconsider if we still need support for Debian 6.

@graphaelli
Copy link
Member

Can we use zips from https://github.com/go-yaml/yaml/archive/v2.zip and https://github.com/tsg/gotpl/archive/master.zip instead of adding them to the repo?

RUN git clone https://github.com/go-yaml/yaml.git /go/src/gopkg.in/yaml.v2
# Old git version which does not support proxy with go get directly, and git cloning
# from github also no longer works.
ADD go-yaml.tar.gz /go-yaml.tar.gz
Copy link
Member

Choose a reason for hiding this comment

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

I think we would have move visibility into this dependency if it were copied from the dev-tools/vendor directory. This will probably be better for maintainability.

@tsg
Copy link
Contributor Author

tsg commented Feb 23, 2018

make package seems to work locally, with the vendored version.

Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -1,5 +1,6 @@
#!/bin/sh

cp -r ../../../vendor/gopkg.in/yaml.v2 beats-builder/yaml.v2
Copy link
Member

Choose a reason for hiding this comment

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

Probably should add these dirs to .gitignore.

It seems that by now Debian 6 is so old that `git clone` from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as vendored files.

Tested `make package` locally.
@tsg tsg force-pushed the avoid_clone_on_deb6 branch from c9e7ed6 to 2bc4645 Compare February 23, 2018 17:39
@tsg
Copy link
Contributor Author

tsg commented Feb 23, 2018

Added .gitignore and rebased to cleanup the history.

@andrewkroh andrewkroh merged commit 07a2669 into elastic:master Feb 23, 2018
@tsg tsg added the needs_backport PR is waiting to be backported to other branches. label Feb 23, 2018
tsg added a commit to tsg/beats that referenced this pull request Feb 23, 2018
It seems that by now Debian 6 is so old that `git clone` from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as vendored files.

Tested `make package` locally.
@tsg tsg mentioned this pull request Feb 23, 2018
tsg added a commit to tsg/beats that referenced this pull request Feb 23, 2018
It seems that by now Debian 6 is so old that `git clone` from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as vendored files.

Tested `make package` locally.
graphaelli pushed a commit that referenced this pull request Feb 23, 2018
* Use the tudorg/xgo-base image from docker hub (#6448)

Another attempt to fix the transient packaging error. I pushed the
tudorg/xgo-base image to Docker Hub and have the build script pull it
from there, rather than building it locally.

This should reduce the amount of network dependencies and speed up the
build as well.

Same could be done for xgo-base-deb, but this part is currently more
critical.

* Avoid git cloning from the deb6 image (#6459)

It seems that by now Debian 6 is so old that `git clone` from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as vendored files.

Tested `make package` locally.

* Remove dependency on gopkg.in (#6461)

This removes the remaining `go get` for gotpl, by using the vendored
copy. This should get rid of our dependency on the gopkg.in service.
ruflin pushed a commit that referenced this pull request Feb 27, 2018
It seems that by now Debian 6 is so old that `git clone` from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as vendored files.

Tested `make package` locally.
andrewkroh pushed a commit to andrewkroh/beats that referenced this pull request Mar 11, 2018
It seems that by now Debian 6 is so old that `git clone` from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as vendored files.

Tested `make package` locally.
ruflin pushed a commit that referenced this pull request Mar 12, 2018
It seems that by now Debian 6 is so old that `git clone` from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as vendored files.

Tested `make package` locally.
@tsg tsg removed the needs_backport PR is waiting to be backported to other branches. label Mar 29, 2018
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
It seems that by now Debian 6 is so old that `git clone` from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as vendored files.

Tested `make package` locally.
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* Use the tudorg/xgo-base image from docker hub (elastic#6448)

Another attempt to fix the transient packaging error. I pushed the
tudorg/xgo-base image to Docker Hub and have the build script pull it
from there, rather than building it locally.

This should reduce the amount of network dependencies and speed up the
build as well.

Same could be done for xgo-base-deb, but this part is currently more
critical.

* Avoid git cloning from the deb6 image (elastic#6459)

It seems that by now Debian 6 is so old that `git clone` from Github
repositories no longer works. We only needed git clone from it to
get gotpl running, which is a relatively small program so I included it
and its dependency (go-yaml) as vendored files.

Tested `make package` locally.

* Remove dependency on gopkg.in (elastic#6461)

This removes the remaining `go get` for gotpl, by using the vendored
copy. This should get rid of our dependency on the gopkg.in service.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants