Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

feat: use Docker copy to transfer binaries to containers (backport #1136)#1144

Merged
mdelapenya merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1136
May 6, 2021
Merged

feat: use Docker copy to transfer binaries to containers (backport #1136)#1144
mdelapenya merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1136

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 5, 2021

This is an automatic backport of pull request #1136 done by Mergify.
Cherry-pick of f39aba5 has failed:

On branch mergify/bp/7.x/pr-1136
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit f39aba58.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .pre-commit-config.yaml
	modified:   cli/config/compose/services/centos-systemd/docker-compose.yml
	modified:   cli/config/compose/services/centos/docker-compose.yml
	modified:   cli/config/compose/services/debian-systemd/docker-compose.yml
	modified:   cli/config/compose/services/debian/docker-compose.yml
	modified:   cli/config/compose/services/fleet-server-centos/docker-compose.yml
	modified:   cli/config/compose/services/fleet-server-debian/docker-compose.yml
	modified:   e2e/_suites/fleet/fleet.go
	new file:   internal/_testresources/dockerCopy.txt
	new file:   internal/_testresources/sample.tar.gz
	new file:   internal/docker/docker_test.go
	modified:   internal/installer/tar.go
	modified:   internal/utils/utils.go
	modified:   internal/utils/utils_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/docker/docker.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mdelapenya
feat: use Docker copy to transfer binaries to containers (#1136)
df70e88 
* feat: do not mount volumes for agent installer, copying it into the running container

* chore: skip TAR files from pre-commit

* fix: use different temp dirs per download

* fix: add TAR header for non-TAR installers (RPM, DEB)

(cherry picked from commit f39aba5)

# Conflicts:
#	internal/docker/docker.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label May 5, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 5, 2021

This pull request is now in conflict. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-1136 upstream/mergify/bp/7.x/pr-1136
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-1136

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 5, 2021 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #1144 updated

  • Start Time: 2021-05-06T08:47:27.332+0000

  • Duration: 23 min 28 sec

  • Commit: a2ee311

Test stats 🧪

Test Results
Failed 0
Passed 159
Skipped 0
Total 159

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 159
Skipped 0
Total 159

@mdelapenya
Merge branch '7.x' into mergify/bp/7.x/pr-1136
a2ee311 
* 7.x:
  chore: abstract image pulling (#1137) (#1138)
  Pull fresh docker images before suite (#1123) (#1140)
@mdelapenya
Copy link
Copy Markdown
Contributor

mdelapenya commented May 6, 2021

@Mergifyio refresh

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 6, 2021

Command refresh: success

Pull request refreshed

@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label May 6, 2021
@mdelapenya mdelapenya merged commit 503d69e into 7.x May 6, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-1136 branch May 6, 2021 09:29
@mdelapenya mdelapenya mentioned this pull request Oct 26, 2021
Merged
8 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@mdelapenya mdelapenya

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @mdelapenya