From 0c9e0c5bf18ccaf4e4ddf91852fe8ba33b7269e7 Mon Sep 17 00:00:00 2001 From: Yevhenii Semendiak Date: Tue, 9 Jul 2024 22:25:02 +0300 Subject: [PATCH] Rebrand to Apolo (#90) * Rebrand to apolo * fix ci * another way --- .dockerignore | 2 +- Dockerfile | 13 ++++++----- Makefile | 6 ++--- apolo.readme | 50 +++++++++++++++++++++++++++++++++++++++++ docker-entrypoint.sh | 4 ++-- neuro.readme | 44 ------------------------------------ requirements/python.txt | 4 ++-- 7 files changed, 66 insertions(+), 57 deletions(-) create mode 100644 apolo.readme delete mode 100644 neuro.readme diff --git a/.dockerignore b/.dockerignore index 0b8785d..a352032 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,4 @@ * !requirements !docker-entrypoint.sh -!neuro.readme +!apolo.readme diff --git a/Dockerfile b/Dockerfile index 67dc8e4..a5114ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ 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 -ARG BASE_DIR=/opt/neuro/web-shell +ARG BASE_DIR=/opt/apolo/web-shell RUN mkdir -p $BASE_DIR COPY requirements/apt.txt requirements/python.txt $BASE_DIR/ @@ -18,14 +18,17 @@ 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/* + 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 EXPOSE 7681 ENV SHELL=/bin/bash WORKDIR=/root -COPY docker-entrypoint.sh neuro.readme $BASE_DIR/ +COPY docker-entrypoint.sh apolo.readme $BASE_DIR/ RUN chmod +x $BASE_DIR/docker-entrypoint.sh -ENTRYPOINT ["/sbin/tini", "--", "/opt/neuro/web-shell/docker-entrypoint.sh"] -CMD ["ttyd", "screen", "-A", "-xR", "neuro"] +ENTRYPOINT ["/sbin/tini", "--", "/opt/apolo/web-shell/docker-entrypoint.sh"] +CMD ["ttyd", "screen", "-A", "-xR", "apolo"] diff --git a/Makefile b/Makefile index 9afef5f..3de2df9 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ build: sanity-test: neuro -v run --pass-config image:${IMAGE_NAME}:${IMAGE_TAG} -- bash -euo pipefail -c "\ - neuro --version; \ - neuro config show; \ - neuro-flow --version; \ + apolo --version; \ + apolo config show; \ + apolo-flow --version; \ " diff --git a/apolo.readme b/apolo.readme new file mode 100644 index 0000000..933816a --- /dev/null +++ b/apolo.readme @@ -0,0 +1,50 @@ + + . + -##. + -**##: +@@@ + +***** : +@@@ + +***** -=- =@@@@@%#@@@ .@@@.@@@@@@. :@@@@@@@: +@@@ +@@@@@@%. + +++**+ @@@@@#%@@@@@ .@@@@@#%@@@@# @@@@@#@@@@@ +@@@ @@@@@#@@@@# + .+++++= ****** =@@@- %@@@ .@@@- %@@@*@@@ .@@@*+@@@ %@@@ =@@@: + ===++- =***** =@@@: %@@@ .@@@. *@@@*@@@ .@@@#+@@@ @@@@ -@@@: + .=====. =***** @@@@#:=@@@@@ .@@@@#:-@@@@%.@@@@+:*@@@@ +@@@ :@@@@-:#@@@@ +.--===. .*****. %@@@@@@#@@@ .@@@-@@@@@@- #@@@@@@@* +@@@ .@@@@@@@@- + .@@@ + .@@@ + .@@@ + + +Welcome to Apolo! + +You are already logged in. + + +To list all possible commands in platform CLI and pipeline engine, run: + + apolo --help + apolo-flow --help + + +Run a simple job: + + apolo run alpine:latest echo 'Hello, World!' + + +Create a project, upload project files and run a Jupyter notebook: + + cookiecutter gh:neuro-inc/cookiecutter-neuro-project --checkout release + cd + apolo-flow build train + apolo-flow upload ALL + apolo-flow run jupyter --suffix trial + +Open the link suggested by the last command and dive into a Jupyter notebook session. + + +Please don't forget to kill your jobs! + + apolo-flow kill jupyter trial # kill jupyter only + apolo kill $(apolo -q ps) # kill all active jobs + apolo kill $(hostname) # kill current shell only + +Visit our docs at https://docs.neu.ro for more details. diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 4ddab4d..f253361 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -2,7 +2,7 @@ echo "defscrollback 10000" >> ~/.screenrc echo "termcapinfo xterm* ti@:te@" >> ~/.screenrc -screen -T xterm-256color -Sdm neuro -screen -S neuro -p 0 -X stuff "cd $WORKDIR; cat /opt/neuro/web-shell/neuro.readme^M" +screen -T xterm-256color -Sdm apolo +screen -S apolo -p 0 -X stuff "cd $WORKDIR; cat /opt/apolo/web-shell/apolo.readme^M" exec "$@" diff --git a/neuro.readme b/neuro.readme deleted file mode 100644 index fba51e9..0000000 --- a/neuro.readme +++ /dev/null @@ -1,44 +0,0 @@ - - - _/ _/ - _/_/ _/ _/_/ _/ _/ _/ _/_/ _/_/ - _/ _/ _/ _/_/_/_/ _/ _/ _/_/ _/ _/ - _/ _/_/ _/ _/ _/ _/ _/ _/ -_/ _/ _/_/_/ _/_/_/ _/ _/ _/_/ - - - -Welcome to Neu.ro! - -You are already logged in. - - -To list all possible commands in platform CLI and pipeline engine, run: - - neuro --help - neuro-flow --help - - -Run a simple job: - - neuro run alpine:latest echo 'Hello, World!' - - -Create a project, upload project files and run a Jupyter notebook: - - cookiecutter gh:neuro-inc/cookiecutter-neuro-project --checkout release - cd - neuro-flow build train - neuro-flow upload ALL - neuro-flow run jupyter --suffix trial - -Open the link suggested by the last command and dive into a Jupyter notebook session. - - -Please don't forget to kill your jobs! - - neuro-flow kill jupyter trial # kill jupyter only - neuro kill $(neuro -q ps) # kill all active jobs - neuro kill $(hostname) # kill current shell only - -Visit our docs at https://docs.neu.ro for more details. diff --git a/requirements/python.txt b/requirements/python.txt index f851817..441cca4 100644 --- a/requirements/python.txt +++ b/requirements/python.txt @@ -1,2 +1,2 @@ -cookiecutter==2.2.2 -neuro-all==23.7.0 +cookiecutter==2.6.0 +neuro-all==24.7.0