[PR #701] [CLOSED] Fix integration test issues due to multi-arch #1583

Closed
opened 2025-12-29 02:30:49 +01:00 by adam · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/701
Author: @juanfont
Created: 7/31/2022
Status: Closed

Base: mainHead: fix-integration-docker


📝 Commits (8)

  • 0f3dc9d Use BuildKit when building integration tests headscale containers
  • dbc25e9 Use replace for temporary fork of dockertest
  • b11c77f Updated vendor checksum
  • 671620b Include changes in dockerfiles
  • 9470950 Add a step to set up buildx in integration tests
  • 2b683aa Try to find out issues in docker buildx
  • c084697 Check output from buildx
  • a2d1b88 Fix variable for container name

📊 Changes

7 files changed (+88 additions, -52 deletions)

View changed files

📝 .github/workflows/test-integration.yml (+17 -0)
📝 flake.nix (+1 -1)
📝 go.mod (+6 -4)
📝 go.sum (+15 -36)
📝 integration_cli_test.go (+19 -3)
📝 integration_embedded_derp_test.go (+18 -6)
📝 integration_test.go (+12 -2)

📄 Description

Currently our integration tests are broken due to the changes in the Dockerfile to add multi-arch support.

This is due to the lack of support in the dockertest library for the new BuildKit library from docker/moby. I have set a PR to dockertest to fix that https://github.com/ory/dockertest/pull/374

This PR changes the integration tests to use the patched version of dockertest, and replaces the library in go.mod to point to my fork. Hopefully this last part will be removed in a few days.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/juanfont/headscale/pull/701 **Author:** [@juanfont](https://github.com/juanfont) **Created:** 7/31/2022 **Status:** ❌ Closed **Base:** `main` ← **Head:** `fix-integration-docker` --- ### 📝 Commits (8) - [`0f3dc9d`](https://github.com/juanfont/headscale/commit/0f3dc9de4e7408c18a9981558d102e2cacbda633) Use BuildKit when building integration tests headscale containers - [`dbc25e9`](https://github.com/juanfont/headscale/commit/dbc25e992f3943e0571cfe8c67d2bf8defca5e47) Use replace for temporary fork of dockertest - [`b11c77f`](https://github.com/juanfont/headscale/commit/b11c77f6922ad2d48033ee3774dbba39bab76291) Updated vendor checksum - [`671620b`](https://github.com/juanfont/headscale/commit/671620bc8bf97322b43160141b6a8636f84b8a4e) Include changes in dockerfiles - [`9470950`](https://github.com/juanfont/headscale/commit/947095020bbe4335e704ab7e8ce165852247910b) Add a step to set up buildx in integration tests - [`2b683aa`](https://github.com/juanfont/headscale/commit/2b683aa0ee7065e01810ebcd5556585b2d8c64e2) Try to find out issues in docker buildx - [`c084697`](https://github.com/juanfont/headscale/commit/c0846978ed621e1edfa8be4262b623686890da06) Check output from buildx - [`a2d1b88`](https://github.com/juanfont/headscale/commit/a2d1b88b8083f2828446eabfad181ea6f89fa3fe) Fix variable for container name ### 📊 Changes **7 files changed** (+88 additions, -52 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/test-integration.yml` (+17 -0) 📝 `flake.nix` (+1 -1) 📝 `go.mod` (+6 -4) 📝 `go.sum` (+15 -36) 📝 `integration_cli_test.go` (+19 -3) 📝 `integration_embedded_derp_test.go` (+18 -6) 📝 `integration_test.go` (+12 -2) </details> ### 📄 Description Currently our integration tests are broken due to the changes in the Dockerfile to add multi-arch support. This is due to the lack of support in the dockertest library for the new BuildKit library from docker/moby. I have set a PR to dockertest to fix that https://github.com/ory/dockertest/pull/374 This PR changes the integration tests to use the patched version of dockertest, and replaces the library in go.mod to point to my fork. Hopefully this last part will be removed in a few days. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 02:30:49 +01:00
adam closed this issue 2025-12-29 02:30:49 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#1583