diff --git a/Dockerfile b/Dockerfile index a5114ee..9bfec48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:23.04 +FROM ubuntu:25.04 ADD https://github.com/tsl0922/ttyd/releases/download/1.6.3/ttyd.x86_64 /usr/bin/ttyd RUN chmod +x /usr/bin/ttyd -ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini /sbin/tini -RUN chmod +x /sbin/tini +ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini /usr/sbin/tini +RUN chmod +x /usr/sbin/tini ARG BASE_DIR=/opt/apolo/web-shell RUN mkdir -p $BASE_DIR @@ -18,10 +18,7 @@ RUN apt-get update -qq && \ python -m pip install -U pip --break-system-packages && \ pip3 install -U --no-cache-dir -r $BASE_DIR/python.txt --break-system-packages && \ apt autoclean && apt autoremove -y --purge && rm -rf /var/lib/apt/lists/* && \ - rm $BASE_DIR/* && \ - ln -s $(which neuro) /usr/bin/apolo && \ - ln -s $(which neuro-flow) /usr/bin/apolo-flow && \ - ln -s $(which neuro-extras) /usr/bin/apolo-extras + rm $BASE_DIR/* EXPOSE 7681 @@ -30,5 +27,5 @@ ENV SHELL=/bin/bash WORKDIR=/root COPY docker-entrypoint.sh apolo.readme $BASE_DIR/ RUN chmod +x $BASE_DIR/docker-entrypoint.sh -ENTRYPOINT ["/sbin/tini", "--", "/opt/apolo/web-shell/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/sbin/tini", "--", "/opt/apolo/web-shell/docker-entrypoint.sh"] CMD ["ttyd", "screen", "-A", "-xR", "apolo"]