From acf135888bb0e157410113caad8b7630ebd68856 Mon Sep 17 00:00:00 2001
From: Tine Jozelj <tine@tjo.space>
Date: Fri, 25 Dec 2020 18:32:27 +0100
Subject: [PATCH] feat(packages:mosh): add mosh-server and mosh-client

---
 Dockerfile.ubuntu        | 2 ++
 Makefile                 | 4 +++-
 packages/Dockerfile.mosh | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 445b8b7..7770960 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -55,6 +55,8 @@ COPY --from=ghcr.io/mentos1386/starship:0.47.0 /usr/local/bin/starship /usr/loca
 COPY --from=ghcr.io/mentos1386/kubectl:1.20.0 /usr/local/bin/kubectl /usr/local/bin/kubectl
 COPY --from=ghcr.io/mentos1386/glow:1.3.0 /usr/local/bin/glow /usr/local/bin/glow
 COPY --from=ghcr.io/mentos1386/mosh:master /usr/local/bin/mosh /usr/local/bin/mosh
+COPY --from=ghcr.io/mentos1386/mosh:master /usr/local/bin/mosh-server /usr/local/bin/mosh-server
+COPY --from=ghcr.io/mentos1386/mosh:master /usr/local/bin/mosh-client /usr/local/bin/mosh-client
 # Golang
 COPY --from=golang:1.15.6 --chown=${SSH_USER} /usr/local/go /home/${SSH_USER}/.go
 ENV PATH=/home/${SSH_USER}/.go/bin:$PATH
diff --git a/Makefile b/Makefile
index 2c1e06a..c4bdd8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 REGISTRY=ghcr.io/mentos1386
+PROGRESS=plain
+
 
 build:
 	@docker buildx build --load -t ${REGISTRY}/workspace-ubuntu:edge -f Dockerfile.ubuntu .
@@ -13,7 +15,7 @@ build-package-glow:
 	@docker buildx build --load -t ${REGISTRY}/glow:1.3.0 -f packages/Dockerfile.glow packages/
 
 build-package-mosh:
-	@docker buildx build --load -t ${REGISTRY}/mosh:master -f packages/Dockerfile.mosh packages/
+	@docker buildx build --progress ${PROGRESS} --load -t ${REGISTRY}/mosh:master -f packages/Dockerfile.mosh packages/
 
 build-packages: package-kubectl package-starship
 
diff --git a/packages/Dockerfile.mosh b/packages/Dockerfile.mosh
index cd7ce6a..2cb8e9b 100644
--- a/packages/Dockerfile.mosh
+++ b/packages/Dockerfile.mosh
@@ -47,6 +47,8 @@ LABEL org.opencontainers.image.source https://github.com/mentos1386/workspace
 RUN apk --no-cache add perl
 
 COPY --from=build /usr/local/bin/mosh /usr/local/bin/mosh
+COPY --from=build /usr/local/bin/mosh-server /usr/local/bin/mosh-server
+COPY --from=build /usr/local/bin/mosh-client /usr/local/bin/mosh-client
 
 ENTRYPOINT /usr/local/bin/mosh