Update Dockerfile to use pre-built OpenSSH binary and fix test reference to SSH binary (#522)

* Update Dockerfile to use pre-built OpenSSH binary and fix test reference to SSH binary

* Add support for multiple SSH binary versions in tests

Dockerfile

@@ -13,15 +13,9 @@ RUN --mount=target=/src,type=bind,source=. --mount=type=cache,target=/root/.cach
 ADD entrypoint.sh /sshpiperd
 
 FROM builder as testrunner
-RUN apt update && apt install -y autoconf automake libssl-dev libz-dev
 
-RUN cd /tmp && \
-    curl -fsSL https://github.com/openssh/openssh-portable/archive/refs/tags/V_9_8_P1.tar.gz | tar xz && \
-    cd openssh-portable-V_9_8_P1 && \
-    autoreconf && \
-    ./configure && \
-    make ssh && \
-    cp ssh /usr/bin/ssh-9.8.1p1
+COPY --from=farmer1992/openssh-static:V_9_8_P1 /usr/bin/ssh /usr/bin/ssh-9.8p1
+COPY --from=farmer1992/openssh-static:V_8_0_P1 /usr/bin/ssh /usr/bin/ssh-8.0p1
 
 FROM docker.io/busybox
 # LABEL maintainer="Boshi Lian<farmer1992@gmail.com>"

e2e/fixed_test.go

@@ -30,11 +30,25 @@ func TestFixed(t *testing.T) {
 
 	waitForEndpointReady(piperaddr)
 
+	for _, tc := range []struct {
+		name string
+		bin  string
+	}{
+		{
+			name: "without-sshping",
+			bin:  "ssh-8.0p1",
+		},
+		{
+			name: "with-sshping",
+			bin:  "ssh-9.8p1",
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
 			randtext := uuid.New().String()
 			targetfie := uuid.New().String()
 
 			c, stdin, stdout, err := runCmd(
-		"ssh-9.8.1p1",
+				tc.bin,
 				"-v",
 				"-o",
 				"StrictHostKeyChecking=no",
@@ -65,6 +79,9 @@ func TestFixed(t *testing.T) {
 			time.Sleep(time.Second * 3) // wait for file flush
 
 			checkSharedFileContent(t, targetfie, randtext)
+		})
+	}
+
 }
 
 func TestHostkeyParam(t *testing.T) {