saadpie commited on
Commit
f43e786
·
verified ·
1 Parent(s): 15ad783

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +21 -30
Dockerfile CHANGED
@@ -2,50 +2,41 @@ FROM ubuntu:22.04
2
 
3
  ENV DEBIAN_FRONTEND=noninteractive
4
 
5
- # Install dependencies + libwebsockets for ttyd
6
  RUN apt-get update && apt-get install -y \
7
- curl \
8
- git \
9
- python3 \
10
- python3-pip \
11
- python3-venv \
12
- nodejs \
13
- npm \
14
- build-essential \
15
- clang \
16
- cmake \
17
- sudo \
18
  wget \
19
- tini \
20
- libwebsockets-dev \
21
  ca-certificates \
 
 
22
  && rm -rf /var/lib/apt/lists/*
23
 
24
- # Download ttyd with architecture detection
25
  RUN ARCH=$(uname -m) && \
26
- if [ "$ARCH" = "x86_64" ]; then DOWNLOAD_ARCH="x86_64"; else DOWNLOAD_ARCH="aarch64"; fi && \
27
- wget -O /usr/local/bin/ttyd https://github.com/tsl0922/ttyd/releases/download/1.7.7/ttyd.${DOWNLOAD_ARCH} && \
 
28
  chmod +x /usr/local/bin/ttyd
29
 
30
- # Create persistent data directory
31
  RUN mkdir -p /data && chmod 777 /data
32
-
33
  WORKDIR /data
34
 
35
- # Use envsubst-safe password (avoid special chars) or pass via env at runtime
36
- ENV TERMINAL_PASSWORD="saadpie_secure_pass"
37
  ENV APP_PORT=7860
38
 
39
  EXPOSE 7860
40
 
41
- # Health check: verify ttyd is responding
42
- HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=3 \
43
- CMD curl -f -u admin:${TERMINAL_PASSWORD} http://localhost:${APP_PORT}/ || exit 1
44
 
 
45
  ENTRYPOINT ["/usr/bin/tini", "--"]
46
-
47
- # Key fixes:
48
- # 1. --interface 0.0.0.0 (bind to all interfaces)
49
- # 2. --port ${APP_PORT} (use env var)
50
- # 3. Quote credential to handle special chars
51
- CMD ["python3", "-m", "http.server", "7860", "--bind", "0.0.0.0"]
 
2
 
3
  ENV DEBIAN_FRONTEND=noninteractive
4
 
5
+ # Install ONLY what ttyd needs + curl for healthcheck
6
  RUN apt-get update && apt-get install -y \
 
 
 
 
 
 
 
 
 
 
 
7
  wget \
8
+ curl \
 
9
  ca-certificates \
10
+ libwebsockets15 \
11
+ tini \
12
  && rm -rf /var/lib/apt/lists/*
13
 
14
+ # Download ttyd 1.7.7 (static binary, no build needed)
15
  RUN ARCH=$(uname -m) && \
16
+ if [ "$ARCH" = "x86_64" ]; then DL_ARCH="x86_64"; else DL_ARCH="aarch64"; fi && \
17
+ wget -q -O /usr/local/bin/ttyd \
18
+ https://github.com/tsl0922/ttyd/releases/download/1.7.7/ttyd.${DL_ARCH} && \
19
  chmod +x /usr/local/bin/ttyd
20
 
21
+ # Persistent storage directory (HF mounts /data automatically)
22
  RUN mkdir -p /data && chmod 777 /data
 
23
  WORKDIR /data
24
 
25
+ # Environment
26
+ ENV TERMINAL_PASSWORD="changeme123"
27
  ENV APP_PORT=7860
28
 
29
  EXPOSE 7860
30
 
31
+ # Health check: HF probes this to confirm container is "healthy"
32
+ HEALTHCHECK --interval=15s --timeout=5s --start-period=20s --retries=3 \
33
+ CMD curl -sf -u admin:${TERMINAL_PASSWORD} http://localhost:${APP_PORT}/ || exit 1
34
 
35
+ # Critical: tini as init system + ttyd binding to 0.0.0.0
36
  ENTRYPOINT ["/usr/bin/tini", "--"]
37
+ CMD ["/usr/local/bin/ttyd", \
38
+ "--writable", \
39
+ "--interface", "0.0.0.0", \
40
+ "--port", "7860", \
41
+ "--credential", "admin:changeme123", \
42
+ "bash"]