Revert "Revert "Revert "Revert "dev stuff, do revert""""

This reverts commit ae64ac5.

core/files_artifacts_expander/scripts/build.sh

@@ -17,13 +17,7 @@ BUILD_DIRNAME="build"
 
 DEFAULT_SKIP_DOCKER_IMAGE_BUILDING=false
 
-DEFAULT_ARCHITECTURE_TO_BUILD="unknown"
-
-if [ "$uname_arch" == "x86_64" ] || [ "$uname_arch" == "amd64" ]; then
-    DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
-elif [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "arm64" ]; then
-    DEFAULT_ARCHITECTURE_TO_BUILD="arm64"
-fi
+DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
 
 MAIN_GO_FILEPATH="${expander_root_dirpath}/main.go"
 MAIN_BINARY_OUTPUT_FILENAME="files-artifacts-expander"

core/launcher/api_container_launcher/api_container_launcher.go

@@ -21,7 +21,7 @@ const (
 	enclaveDataVolumeDirpath = "/kurtosis-data"
 
 	// TODO This should come from the same logic that builds the server image!!!!!
-	containerImage = "kurtosistech/core"
+	containerImage = "h4ck3rk3y/core"
 )
 
 type ApiContainerLauncher struct {

core/server/api_container/server/startosis_engine/kurtosis_types/service_config/service_config.go

@@ -44,7 +44,7 @@ const (
 
 	filesArtifactExpansionDirsParentDirpath string = "/files-artifacts"
 	// TODO This should be populated from the build flow that builds the files-artifacts-expander Docker image
-	filesArtifactsExpanderImage string = "kurtosistech/files-artifacts-expander"
+	filesArtifactsExpanderImage string = "h4ck3rk3y/files-artifacts-expander"
 
 	minimumMemoryAllocationMegabytes = 6
 )

core/server/scripts/build.sh

@@ -15,13 +15,7 @@ BUILD_DIRNAME="build"
 
 DEFAULT_SKIP_DOCKER_IMAGE_BUILDING=false
 
-DEFAULT_ARCHITECTURE_TO_BUILD="unknown"
-
-if [ "$uname_arch" == "x86_64" ] || [ "$uname_arch" == "amd64" ]; then
-    DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
-elif [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "arm64" ]; then
-    DEFAULT_ARCHITECTURE_TO_BUILD="arm64"
-fi
+DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
 
 MAIN_DIRNAME="api_container"
 MAIN_GO_FILEPATH="${server_root_dirpath}/${MAIN_DIRNAME}/main.go"

engine/launcher/engine_server_launcher/engine_server_launcher.go

@@ -20,7 +20,7 @@ import (
 
 const (
 	// TODO This should come from the same logic that builds the server image!!!!!
-	containerImage = "kurtosistech/engine"
+	containerImage = "h4ck3rk3y/engine"
 )
 
 type EngineServerLauncher struct {

engine/server/scripts/build.sh

@@ -15,13 +15,7 @@ BUILD_DIRNAME="build"
 
 DEFAULT_SKIP_DOCKER_IMAGE_BUILDING=false
 
-DEFAULT_ARCHITECTURE_TO_BUILD="unknown"
-
-if [ "$uname_arch" == "x86_64" ] || [ "$uname_arch" == "amd64" ]; then
-    DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
-elif [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "arm64" ]; then
-    DEFAULT_ARCHITECTURE_TO_BUILD="arm64"
-fi
+DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
 
 MAIN_DIRNAME="engine"
 MAIN_GO_FILEPATH="${engine_root_dirpath}/${MAIN_DIRNAME}/main.go"

images.py

@@ -0,0 +1,28 @@
+MY_USER_NAME = "h4ck3rk3y"
+
+import subprocess
+import sys
+
+image_tag = sys.argv[1]
+
+def execute(command):
+    return subprocess.check_output(command, shell=True, universal_newlines=True)
+
+# login = execute(f"aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin {ECR_ADDRESS}")
+
+returned_text = execute(f"docker image ls | grep {image_tag}")
+
+for line in returned_text.split("\n"):
+    if line == "":
+        continue
+    image, tag, image_id = line.split()[:3]
+    author, repo = image.split("/")
+    print(image, tag, image_id)
+
+    if not image.startswith("kurtosistech"):
+        continue
+
+    execute(f"docker tag {image_id} {MY_USER_NAME}/{repo}:{tag}")
+    execute(f"docker push {MY_USER_NAME}/{repo}:{tag}")
+
+

scripts/docker-image-builder.sh

@@ -40,12 +40,6 @@ uname_arch=$(uname -m)
 
 architecture="amd64"
 
-if [ "$uname_arch" == "x86_64" ] || [ "$uname_arch" == "amd64" ]; then
-    architecture="amd64"
-elif [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "arm64" ]; then
-    architecture="arm64"
-fi
-
 # Argument processing
 if "${push_to_registry_container}"; then
   buildx_platform_arg='linux/arm64/v8,linux/amd64'