From 2f5a5d0e78834102c765a4367434705a46ec1c29 Mon Sep 17 00:00:00 2001 From: Siarhei Siniak Date: Sat, 6 Jul 2024 12:02:05 +0300 Subject: [PATCH] [~] Refactor --- docker/tiktok/Dockerfile | 3 ++- docker/tiktok/Makefile | 23 +++++++++++++++++++++++ docker/tiktok/entry.sh | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 docker/tiktok/Makefile diff --git a/docker/tiktok/Dockerfile b/docker/tiktok/Dockerfile index ddb357d..1dbd6f8 100644 --- a/docker/tiktok/Dockerfile +++ b/docker/tiktok/Dockerfile @@ -5,4 +5,5 @@ RUN apt-get update -yy && apt-get install -yy zsh htop mc git WORKDIR /app -CMD ["bash", "docker/tiktok/entry.sh"] +ENTRYPOINT ["bash", "docker/tiktok/entry.sh"] +CMD ["zsh", "-l"] diff --git a/docker/tiktok/Makefile b/docker/tiktok/Makefile new file mode 100644 index 0000000..2ddeb8a --- /dev/null +++ b/docker/tiktok/Makefile @@ -0,0 +1,23 @@ +PROJECT_ROOT := ${PWD} + +PORT ?= 8888 +TOKEN ?= $(shell pwgen -n 20 1) + +run: + cd ${PROJECT_ROOT} && \ + sudo docker-compose \ + -f docker/tiktok/docker-compose.yml \ + run \ + --rm tiktok + +jupyter: + cd ${PROJECT_ROOT} && \ + sudo docker-compose \ + -f docker/tiktok/docker-compose.yml \ + run \ + -p 127.0.0.1:${PORT}:8888 \ + --rm tiktok \ + jupyter-lab \ + --allow-root \ + --ip=0.0.0.0 \ + --NotebookApp.token=${TOKEN} diff --git a/docker/tiktok/entry.sh b/docker/tiktok/entry.sh index 776176f..7863028 100644 --- a/docker/tiktok/entry.sh +++ b/docker/tiktok/entry.sh @@ -5,4 +5,4 @@ mkdir -p tmp/cache/tiktok/jupyter ln -sf $PWD/tmp/cache/tiktok/zsh/histfile ~/.histfile ln -sf $PWD/tmp/cache/tiktok/jupyter ~/.jupyter ln -sf $PWD/tmp/cache/tiktok/ipython ~/.ipython -exec zsh -l +exec $@