From b202bf3dcb08a2cc90e97b87756f5f88ceb599a1 Mon Sep 17 00:00:00 2001 From: Krzysztof Szumny Date: Sat, 22 Aug 2015 11:10:23 +0200 Subject: [PATCH] compose/pycharm -> compose/debug --- .../compose/{pycharm => debug}/.dockerignore | 0 .../compose/{pycharm => debug}/.gitignore | 0 .../{pycharm => debug}/.ssh_keys_to_docker/id_rsa | 0 .../.ssh_keys_to_docker/id_rsa.pub | 0 .../compose/{pycharm => debug}/Dockerfile | 0 .../compose/{pycharm => debug}/README.md | 4 ++-- .../compose/{pycharm => debug}/entrypoint | 0 .../{pycharm => debug}/pycharm_configuration/1.png | Bin .../{pycharm => debug}/pycharm_configuration/2.png | Bin .../{pycharm => debug}/pycharm_configuration/3.png | Bin .../{pycharm => debug}/pycharm_configuration/4.png | Bin .../{pycharm => debug}/pycharm_configuration/5.png | Bin .../compose/{pycharm => debug}/sshd_config | 0 {{cookiecutter.repo_name}}/debug.yml | 2 +- .../docs/docker_remote_debugging.rst | 4 ++-- 15 files changed, 5 insertions(+), 5 deletions(-) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/.dockerignore (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/.gitignore (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/.ssh_keys_to_docker/id_rsa (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/.ssh_keys_to_docker/id_rsa.pub (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/Dockerfile (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/README.md (96%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/entrypoint (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/pycharm_configuration/1.png (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/pycharm_configuration/2.png (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/pycharm_configuration/3.png (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/pycharm_configuration/4.png (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/pycharm_configuration/5.png (100%) rename {{cookiecutter.repo_name}}/compose/{pycharm => debug}/sshd_config (100%) diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/.dockerignore b/{{cookiecutter.repo_name}}/compose/debug/.dockerignore similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/.dockerignore rename to {{cookiecutter.repo_name}}/compose/debug/.dockerignore diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/.gitignore b/{{cookiecutter.repo_name}}/compose/debug/.gitignore similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/.gitignore rename to {{cookiecutter.repo_name}}/compose/debug/.gitignore diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa b/{{cookiecutter.repo_name}}/compose/debug/.ssh_keys_to_docker/id_rsa similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa rename to {{cookiecutter.repo_name}}/compose/debug/.ssh_keys_to_docker/id_rsa diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa.pub b/{{cookiecutter.repo_name}}/compose/debug/.ssh_keys_to_docker/id_rsa.pub similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa.pub rename to {{cookiecutter.repo_name}}/compose/debug/.ssh_keys_to_docker/id_rsa.pub diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/Dockerfile b/{{cookiecutter.repo_name}}/compose/debug/Dockerfile similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/Dockerfile rename to {{cookiecutter.repo_name}}/compose/debug/Dockerfile diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/README.md b/{{cookiecutter.repo_name}}/compose/debug/README.md similarity index 96% rename from {{cookiecutter.repo_name}}/compose/pycharm/README.md rename to {{cookiecutter.repo_name}}/compose/debug/README.md index 903c430f2..0053f03d2 100644 --- a/{{cookiecutter.repo_name}}/compose/pycharm/README.md +++ b/{{cookiecutter.repo_name}}/compose/debug/README.md @@ -5,8 +5,8 @@ To debug python code inside a docker container, you have to first run: $ docker-compose -f debug.yml up - -Container should be ready, when + +Container should be ready, when ... debug_1 | Starting OpenBSD Secure Shell server: sshd diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint b/{{cookiecutter.repo_name}}/compose/debug/entrypoint similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/entrypoint rename to {{cookiecutter.repo_name}}/compose/debug/entrypoint diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/1.png b/{{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/1.png similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/1.png rename to {{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/1.png diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/2.png b/{{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/2.png similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/2.png rename to {{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/2.png diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/3.png b/{{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/3.png similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/3.png rename to {{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/3.png diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/4.png b/{{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/4.png similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/4.png rename to {{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/4.png diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/5.png b/{{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/5.png similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/pycharm_configuration/5.png rename to {{cookiecutter.repo_name}}/compose/debug/pycharm_configuration/5.png diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/sshd_config b/{{cookiecutter.repo_name}}/compose/debug/sshd_config similarity index 100% rename from {{cookiecutter.repo_name}}/compose/pycharm/sshd_config rename to {{cookiecutter.repo_name}}/compose/debug/sshd_config diff --git a/{{cookiecutter.repo_name}}/debug.yml b/{{cookiecutter.repo_name}}/debug.yml index cae1521c3..008e4a9b1 100644 --- a/{{cookiecutter.repo_name}}/debug.yml +++ b/{{cookiecutter.repo_name}}/debug.yml @@ -6,7 +6,7 @@ postgres: - /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data debug: - build: compose/pycharm/ + build: compose/debug/ command: python -c "import signal; signal.pause()" ports: - "8000:8000" diff --git a/{{cookiecutter.repo_name}}/docs/docker_remote_debugging.rst b/{{cookiecutter.repo_name}}/docs/docker_remote_debugging.rst index b8764eb8d..d809e805a 100644 --- a/{{cookiecutter.repo_name}}/docs/docker_remote_debugging.rst +++ b/{{cookiecutter.repo_name}}/docs/docker_remote_debugging.rst @@ -12,7 +12,7 @@ There is a better tool to login into container if you want to access to shell, i .. _docker exec: https://docs.docker.com/reference/commandline/exec/ .. _attempts on StackOverflow: http://stackoverflow.com/a/28675525/338581 -To avoid putting sshd into production-ready docker image, we create another docker image on top of main ``{{ cookiecutter.repo_name|replace('_', '') }}_django`` image from `compose/pycharm/Dockerfile <../compose/pycharm/Dockerfile>`_. That's why you have to first build main `Dockerfile <../Dockerfile>`_, and you can do that by:: +To avoid putting sshd into production-ready docker image, we create another docker image on top of main ``{{ cookiecutter.repo_name|replace('_', '') }}_django`` image from `compose/debug/Dockerfile <../compose/debug/Dockerfile>`_. That's why you have to first build main `Dockerfile <../Dockerfile>`_, and you can do that by:: $ docker-compose -f dev.yml build @@ -35,7 +35,7 @@ You can test ssh conection using password *docker*, by:: or you can also use ssh-key:: - ssh -i compose/pycharm/.ssh_keys_to_docker/id_rsa docker_{{ cookiecutter.repo_name }}@localhost -p 2222 + ssh -i compose/debug/.ssh_keys_to_docker/id_rsa docker_{{ cookiecutter.repo_name }}@localhost -p 2222 PyCharm