Merge branch 'main' of github.com:kurtosis-tech/kurtosis into skylene…

…t/docker-auth

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.3.1](https://github.com/kurtosis-tech/kurtosis/compare/1.3.0...1.3.1) (2024-10-15)
+
+
+### Bug Fixes
+
+* use docker client without timeout for copy files operation ([#2565](https://github.com/kurtosis-tech/kurtosis/issues/2565)) ([a48ed55](https://github.com/kurtosis-tech/kurtosis/commit/a48ed55069bf7dce77b322bc30c4070a2c85cd7d))
+
 ## [1.3.0](https://github.com/kurtosis-tech/kurtosis/compare/1.2.0...1.3.0) (2024-09-18)
 
 

MAINTAINERS.md

@@ -11,5 +11,6 @@ This document lists the individuals who are responsible for maintaining and cont
 - [Parithosh Jayanthi](https://github.com/parithosh) - Dev Ops @Ethereum Foundation
 - [John Hilliard](https://github.com/praetoriansentry) -  Dev Tools @Polygon Labs
 - [Léo Vincent](https://github.com/leovct) - Dev Tools @Polygon Labs
+- [Kevin Today](https://github.com/mieubrisse) - Original Contributor
 
 For any inquiries or questions regarding the project, please contact one of the core maintainers listed above.

api/golang/kurtosis_version/kurtosis_version.go

@@ -9,6 +9,6 @@ const (
 	// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
 	// This is necessary so that Kurt Core consumers will know if they're compatible with the currently-running
 	//  API container
-	KurtosisVersion = "1.3.0"
+	KurtosisVersion = "1.3.1"
 	// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
 )

api/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kurtosis-sdk"
-version = "1.3.0"
+version = "1.3.1"
 license = "BUSL-1.1"
 description = "Rust SDK for Kurtosis"
 edition = "2021"

api/typescript/package.json

@@ -1,7 +1,7 @@
 {
     "name": "kurtosis-sdk",
     "//": "NOTE: DO NOT UPDATE THIS VERSION MANUALLY - IT WILL BE UPDATED DURING THE RELEASE PROCESS!",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "main": "./build/index",
     "description": "This repo contains a Typescript client for communicating with the Kurtosis Engine server, which is responsible for creating, managing and destroying Kurtosis Enclaves.",
     "types": "./build/index",

api/typescript/src/kurtosis_version/kurtosis_version.ts

@@ -1,5 +1,5 @@
 // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
 // This is necessary so that Kurt Core consumers (e.g. modules) will know if they're compatible with the currently-running
 //  API container
-export const KURTOSIS_VERSION: string = "1.3.0"
+export const KURTOSIS_VERSION: string = "1.3.1"
 // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!

container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/user_services_functions/copy_files_from_user_service.go

@@ -26,7 +26,6 @@ func CopyFilesFromUserService(
 	output io.Writer,
 	dockerManager *docker_manager.DockerManager,
 ) error {
-
 	srcPath := srcPathOnContainer
 	srcPathBase := filepath.Base(srcPathOnContainer)
 	if srcPathBase == doNotIncludeParentDirInArchiveSymbol {
@@ -54,10 +53,11 @@ func CopyFilesFromUserService(
 	}
 	defer tarStreamReadCloser.Close()
 
-	if _, err := io.Copy(output, tarStreamReadCloser); err != nil {
+	if numBytesCopied, err := io.Copy(output, tarStreamReadCloser); err != nil {
 		return stacktrace.Propagate(
 			err,
-			"An error occurred copying the bytes of TAR'd up files at '%v' on service '%v' to the output",
+			"'%v' bytes copied before an error occurred copying the bytes of TAR'd up files at '%v' on service '%v' to the output",
+			numBytesCopied,
 			srcPathOnContainer,
 			serviceUuid,
 		)

container-engine-lib/lib/backend_impls/docker/docker_manager/docker_manager.go

@@ -1553,7 +1553,7 @@ func (manager *DockerManager) CopyFromContainer(ctx context.Context, containerId
 		}
 	}
 
-	tarStreamReadCloser, _, err := manager.dockerClient.CopyFromContainer(
+	tarStreamReadCloser, _, err := manager.dockerClientNoTimeout.CopyFromContainer(
 		ctx,
 		containerId,
 		srcPath)

enclave-manager/web/lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "1.3.0",
+  "version": "1.3.1",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": false,

enclave-manager/web/packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kurtosis/emui-app",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "private": true,
   "homepage": ".",
   "dependencies": {
@@ -10,7 +10,7 @@
     "html-react-parser": "^4.2.2",
     "js-cookie": "^3.0.5",
     "kurtosis-cloud-indexer-sdk": "^0.0.31",
-    "kurtosis-ui-components": "1.3.0",
+    "kurtosis-ui-components": "1.3.1",
     "react-error-boundary": "^4.0.11",
     "react-hook-form": "^7.47.0",
     "react-mentions": "^4.4.10",

enclave-manager/web/packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kurtosis-ui-components",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "private": false,
   "main": "build/index",
   "description": "This repo contains components used by Kurtosis UI applications.",

internal_testsuites/golang/testsuite/startlark_user_passing_test/starlark_user_passing_test.go

@@ -14,7 +14,7 @@ const (
 	userOverrideServiceName = "user-override"
 
 	starlarkScriptWithUserIdPassed = `
-IMAGE = "hyperledger/besu:latest"
+IMAGE = "hyperledger/besu:24.3"
 def run(plan, args):
 	no_override = plan.add_service(
 		name = "` + noOverrideServiceName + `",

version.txt

@@ -1 +1 @@
-1.3.0
+1.3.1