From fae0f87436d72a52b4da0ef9c04712fee58aaa0a Mon Sep 17 00:00:00 2001
From: bytedream <bytedream@protonmail.com>
Date: Thu, 27 Jan 2022 18:33:25 +0100
Subject: [PATCH] Fixed several docker errors

---
 examples/Dockerfile         | 45 +++++++++----------------------------
 examples/docker-compose.yml |  8 ++++---
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/examples/Dockerfile b/examples/Dockerfile
index d1c55f2..33c43ed 100644
--- a/examples/Dockerfile
+++ b/examples/Dockerfile
@@ -1,47 +1,22 @@
-FROM golang:1.17 as server
+FROM alpine:latest as build
 
 WORKDIR /docker4ssh
 
-COPY ["../", "."]
+RUN apk add git go make openssh rustup sqlite
 
-RUN apt update && \
-    apt install make sqlite3 && \
-    apt clean && \
-    apt autoremove && \
-    rm -rf /var/lib/apt/lists/*
+RUN rustup-init -y && \
+    ln -s $HOME/.cargo/bin/cargo /usr/bin/cargo
 
-RUN make BUILDDIR=build/ build-server
-
-
-FROM rust:1.56 as client
-
-WORKDIR /docker4ssh
-
-COPY ../ .
-
-RUN apt update && \
-    apt install make \
-
-RUN make BUILDDIR=build/ build-client
-
-
-FROM alpine:lastest as extra
-
-WORKDIR /docker4ssh
-
-COPY ../ .
-
-RUN apk add make
-
-RUN make BUILDDIR=build/ build-extra
+RUN git clone https://github.com/ByteDream/docker4ssh .
 
+RUN mkdir build/ && \
+    make BUILDDIR=build/ build && \
+    rm -rf build/release/ build/x86_64-unknown-linux-musl/
 
 FROM alpine:latest
 
 WORKDIR /docker4ssh
 
-COPY --from=server /docker4ssh/build/* .
-COPY --from=client /docker4ssh/build/docker4ssh .
-COPY --from=extra /docker4ssh/build/* .
+COPY --from=build /docker4ssh/build/ ./
 
-ENTRYPOINT docker4ssh
+ENTRYPOINT ./docker4ssh start
diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
index 27be371..839b6fb 100644
--- a/examples/docker-compose.yml
+++ b/examples/docker-compose.yml
@@ -2,10 +2,12 @@ version: '3'
 
 services:
   docker4ssh:
-    build: .
+    build: https://raw.githubusercontent.com/ByteDream/docker4ssh/main/examples/Dockerfile
     ports:
-      - "8642:8642"
+      - "2222:2222"
     volumes:
-      - "./docker4ssh.log.log:/docker4ssh/docker4ssh.log"
+      - type: bind
+        source: /var/run/docker.sock
+        target: /var/run/docker.sock
     restart: unless-stopped
     container_name: docker4ssh