From ba889866cca8ad12e72ee3260badb3a4a5676106 Mon Sep 17 00:00:00 2001
From: Mohammed <mrpalide@gmail.com>
Date: Mon, 25 Mar 2024 19:21:22 +0000
Subject: [PATCH] update skywire dockerfile and configs

---
 docker/images/skywire-visor/Dockerfile    |  7 -------
 docker/images/skywire-visor/DockerfileInt |  9 +--------
 docker/integration/visorA.json            | 24 ++++++++++++++++++-----
 docker/integration/visorB.json            | 12 ++++++++++--
 docker/integration/visorC.json            | 20 ++++++++++++++-----
 5 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/docker/images/skywire-visor/Dockerfile b/docker/images/skywire-visor/Dockerfile
index 4dab61a1..2f3de737 100755
--- a/docker/images/skywire-visor/Dockerfile
+++ b/docker/images/skywire-visor/Dockerfile
@@ -16,19 +16,12 @@ RUN apk add --no-cache make git build-base && \
     cd skywire && \
     sh -c /skywire/docker/images/visor/install-preq.sh && \
     make build-race && \
-    mkdir -p /apps && \
-    cp ./build/apps/vpn-server /apps/ && \
-    cp ./build/apps/vpn-client /apps/ && \
-	cp ./build/apps/skysocks /apps/ && \
-	cp ./build/apps/skysocks-client /apps/ && \
-	cp ./build/apps/skychat /apps/
 
 ## Resulting image
 FROM ${base} as visor-runner
 
 COPY --from=builder /skywire/docker/images/visor/install-preq.sh /release/install-preq.sh
 COPY --from=builder /release /release
-COPY --from=builder /apps /apps
 
 RUN sh -c /release/install-preq.sh \
     && rm -rf /release/install-preq.sh \
diff --git a/docker/images/skywire-visor/DockerfileInt b/docker/images/skywire-visor/DockerfileInt
index 69c1ea79..3297ed84 100644
--- a/docker/images/skywire-visor/DockerfileInt
+++ b/docker/images/skywire-visor/DockerfileInt
@@ -14,20 +14,13 @@ WORKDIR /skywire
 
 RUN apk add --no-cache make git build-base && \
     sh -c /skywire/docker/images/visor/install-preq.sh && \
-    make build-race && \
-    mkdir -p /apps && \
-    cp ./build/apps/vpn-server /apps/ && \
-    cp ./build/apps/vpn-client /apps/ && \
-	cp ./build/apps/skysocks /apps/ && \
-	cp ./build/apps/skysocks-client /apps/ && \
-	cp ./build/apps/skychat /apps/
+    make build-race
 
 ## Resulting image
 FROM ${base} as visor-runner
 
 COPY --from=builder /skywire/docker/images/visor/install-preq.sh /release/install-preq.sh
 COPY --from=builder /release /release
-COPY --from=builder /apps /apps
 
 RUN sh -c /release/install-preq.sh \
     && rm -rf /release/install-preq.sh \
diff --git a/docker/integration/visorA.json b/docker/integration/visorA.json
index 9165e5bb..2e1f8ffd 100755
--- a/docker/integration/visorA.json
+++ b/docker/integration/visorA.json
@@ -42,14 +42,20 @@
 		"apps": [
 			{
 				"name": "vpn-client",
-				"binary": "vpn-client",
+				"binary": "skywire",
+				"args": [
+					"app",
+					"vpn-client"
+				],
 				"auto_start": false,
 				"port": 43
 			},
 			{
 				"name": "skychat",
-				"binary": "skychat",
+				"binary": "skywire",
 				"args": [
+					"app",
+					"skychat",
 					"--addr",
 					"*:8001"
 				],
@@ -58,19 +64,27 @@
 			},
 			{
 				"name": "skysocks",
-				"binary": "skysocks",
+				"binary": "skywire",
+				"args": [
+					"app",
+					"skysocks"
+				],
 				"auto_start": true,
 				"port": 3
 			},
 			{
 				"name": "vpn-server",
-				"binary": "vpn-server",
+				"binary": "skywire",
+				"args": [
+					"app",
+					"vpn-server"
+				],
 				"auto_start": false,
 				"port": 44
 			}
 		],
 		"server_addr": ":5505",
-		"bin_path": "/apps"
+		"bin_path": "/"
 	},
 	"hypervisors": ["0348c941c5015a05c455ff238af2e57fb8f914c399aab604e9abb5b32b91a4c1fe"],
 	"cli_addr": "0.0.0.0:3435",
diff --git a/docker/integration/visorB.json b/docker/integration/visorB.json
index 13db599c..2b9a791d 100755
--- a/docker/integration/visorB.json
+++ b/docker/integration/visorB.json
@@ -38,13 +38,21 @@
 		"apps": [
 			{
 				"name": "vpn-client",
-				"binary": "vpn-client",
+				"binary": "skywire",
+				"args": [
+					"app",
+					"vpn-client"
+				],
 				"auto_start": false,
 				"port": 43
 			},
 			{
 				"name": "vpn-server",
-				"binary": "vpn-server",
+				"binary": "skywire",
+				"args": [
+					"app",
+					"vpn-server"
+				],
 				"auto_start": false,
 				"port": 44
 			}
diff --git a/docker/integration/visorC.json b/docker/integration/visorC.json
index 79613adf..b20c3d31 100755
--- a/docker/integration/visorC.json
+++ b/docker/integration/visorC.json
@@ -48,8 +48,10 @@
 		"apps": [
 			{
 				"name": "vpn-client",
-				"binary": "vpn-client",
+				"binary": "skywire",
 				"args": [
+					"app",
+					"vpn-client",
 					"--srv",
 					"024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7",
 					"--killswitch=false"
@@ -59,8 +61,10 @@
 			},
 			{
 				"name": "skychat",
-				"binary": "skychat",
+				"binary": "skywire",
 				"args": [
+					"app",
+					"skychat",
 					"--addr",
 					"*:8001"
 				],
@@ -69,8 +73,10 @@
 			},
 			{
 				"name": "skysocks-client",
-				"binary": "skysocks-client",
+				"binary": "skywire",
 				"args": [
+					"app",
+					"skysocks-client",
 					"--srv",
 					"024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7",
 					"--addr",
@@ -81,13 +87,17 @@
 			},
 			{
 				"name": "vpn-server",
-				"binary": "vpn-server",
+				"binary": "skywire",
+				"args": [
+					"app",
+					"vpn-server"
+				],
 				"auto_start": false,
 				"port": 44
 			}
 		],
 		"server_addr": ":5507",
-		"bin_path": "/apps",
+		"bin_path": "/",
 		"display_node_ip": false
 	},
 	"survey_whitelist": null,