Dockerfile: update base images

diff --git a/Dockerfile b/Dockerfile
index 532923f46435ace525d9fc5a7975481ab81939fb..39f03765e9554c7f762baf50aae7dc58a6a49c18 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
-FROM tsl0922/musl-cross
-RUN git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
+FROM ubuntu:18.04
+RUN apt-get update && apt-get install -y autoconf automake curl cmake git libtool make \
+    && git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
     && cd /ttyd && env BUILD_TARGET=x86_64 WITH_SSL=true ./scripts/cross-build.sh
 
 FROM ubuntu:18.04
@@ -9,6 +10,7 @@ ADD https://github.com/krallin/tini/releases/download/v0.18.0/tini /sbin/tini
 RUN chmod +x /sbin/tini
 
 EXPOSE 7681
+WORKDIR /root
 
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["ttyd", "bash"]

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index 70feb5c73ccfbcfa7ee683c4268a828e628f885c..53266bb51d6a2cc4481718e58d6274ffa639c272 100644 (file)
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -1,12 +1,14 @@
-FROM tsl0922/musl-cross
-RUN git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
+FROM ubuntu:18.04
+RUN apt-get update && apt-get install -y autoconf automake curl cmake git libtool make \
+    && git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
     && cd /ttyd && env BUILD_TARGET=x86_64 WITH_SSL=true ./scripts/cross-build.sh
 
-FROM alpine:3.10
+FROM alpine:3.12
 COPY --from=0 /ttyd/build/ttyd /usr/bin/ttyd
 RUN apk add --no-cache bash tini
 
 EXPOSE 7681
+WORKDIR /root
 
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["ttyd", "bash"]