Skip to content

Commit 9a3d660

Browse files
committed
Dockerfile: update base images
1 parent c856189 commit 9a3d660

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM tsl0922/musl-cross
2-
RUN git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
1+
FROM ubuntu:18.04
2+
RUN apt-get update && apt-get install -y autoconf automake curl cmake git libtool make \
3+
&& git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
34
&& cd /ttyd && env BUILD_TARGET=x86_64 WITH_SSL=true ./scripts/cross-build.sh
45

56
FROM ubuntu:18.04
@@ -9,6 +10,7 @@ ADD https://github.com/krallin/tini/releases/download/v0.18.0/tini /sbin/tini
910
RUN chmod +x /sbin/tini
1011

1112
EXPOSE 7681
13+
WORKDIR /root
1214

1315
ENTRYPOINT ["/sbin/tini", "--"]
1416
CMD ["ttyd", "bash"]

Dockerfile-alpine

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
FROM tsl0922/musl-cross
2-
RUN git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
1+
FROM ubuntu:18.04
2+
RUN apt-get update && apt-get install -y autoconf automake curl cmake git libtool make \
3+
&& git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
34
&& cd /ttyd && env BUILD_TARGET=x86_64 WITH_SSL=true ./scripts/cross-build.sh
45

5-
FROM alpine:3.10
6+
FROM alpine:3.12
67
COPY --from=0 /ttyd/build/ttyd /usr/bin/ttyd
78
RUN apk add --no-cache bash tini
89

910
EXPOSE 7681
11+
WORKDIR /root
1012

1113
ENTRYPOINT ["/sbin/tini", "--"]
1214
CMD ["ttyd", "bash"]

0 commit comments

Comments
 (0)