update parrot image

hckops · Jun 2, 2024 · 510df2a · 510df2a
1 parent f6f11f4
commit 510df2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/docker/parrot-core/Dockerfile b/docker/parrot-core/Dockerfile
@@ -1,5 +1,8 @@
 FROM parrotsec/core
 
+# https://github.com/tsl0922/ttyd/releases
+ARG TTYD_VERSION=1.7.7
+
 ENV DISPLAY :0
 # 1024x768x24
 ENV RESOLUTION 1920x1080x24
@@ -19,10 +22,13 @@ RUN apt-get update && \
     xfce4 \
     xvfb \
     x11vnc \
-    ttyd \
     openvpn && \
     apt-get clean
 
+RUN curl -sSL "https://github.com/tsl0922/ttyd/releases/download/${TTYD_VERSION}/ttyd.$(uname -m)" -o /usr/local/bin/ttyd && \
+  chmod u+x /usr/local/bin/ttyd && \
+  ttyd -v  
+
 # installs noVNC
 RUN apt-get -y install git && \
   git clone --depth 1 https://github.com/novnc/noVNC.git /usr/share/novnc && \
@@ -31,7 +37,7 @@ RUN apt-get -y install git && \
 
 SHELL ["/bin/bash", "-c"]
 
-# setup supervisor
+# setups supervisor
 COPY supervisor /tmp
 RUN apt-get update && apt-get -y install supervisor && \
   echo_supervisord_conf > /etc/supervisord.conf && \

diff --git a/docker/parrot-core/supervisor/supervisor-ttyd.ini b/docker/parrot-core/supervisor/supervisor-ttyd.ini
@@ -1,5 +1,5 @@
 [program:ttyd]
-command=/usr/bin/ttyd --port "%(ENV_TTY_PORT)s" --credential "%(ENV_USERNAME)s:%(ENV_PASSWORD)s" /bin/bash
+command=/usr/local/bin/ttyd --port "%(ENV_TTY_PORT)s" --credential "%(ENV_USERNAME)s:%(ENV_PASSWORD)s" /bin/bash
 redirect_stderr=true
 stdout_logfile=/var/log/ttyd/stdout
 stdout_logfile_maxbytes=5MB