From 654e633ac0d334c85b5e4863908c94e5e135a516 Mon Sep 17 00:00:00 2001 From: Krzysztof Szumny Date: Tue, 18 Aug 2015 21:04:44 +0200 Subject: [PATCH] more Run/Debug configurations! --- .../Docker__createsuperuser.xml | 32 ++++++++++++++++++ .../runConfigurations/Docker__migrate.xml | 32 ++++++++++++++++++ .../{Docker.xml => Docker__runserver.xml} | 6 ++-- .../Docker__runserver_plus.xml | 33 +++++++++++++++++++ .../runConfigurations/Docker__tests___all.xml | 30 +++++++++++++++++ .../Docker__tests___users.xml | 30 +++++++++++++++++ .../compose/pycharm/entrypoint | 2 +- {{cookiecutter.repo_name}}/debug.yml | 8 ++++- 8 files changed, 168 insertions(+), 5 deletions(-) create mode 100644 {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml create mode 100644 {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml rename {{cookiecutter.repo_name}}/.idea/runConfigurations/{Docker.xml => Docker__runserver.xml} (87%) create mode 100644 {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml create mode 100644 {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml create mode 100644 {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml new file mode 100644 index 000000000..604631d9f --- /dev/null +++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml @@ -0,0 +1,32 @@ + + + + \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml new file mode 100644 index 000000000..54e14092e --- /dev/null +++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml @@ -0,0 +1,32 @@ + + + + \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml similarity index 87% rename from {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker.xml rename to {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml index 19d89d673..e59040b19 100644 --- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker.xml +++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml new file mode 100644 index 000000000..808b7e46e --- /dev/null +++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml @@ -0,0 +1,33 @@ + + + + \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml new file mode 100644 index 000000000..55ac834b3 --- /dev/null +++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml @@ -0,0 +1,30 @@ + + + + \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml new file mode 100644 index 000000000..2a70c758e --- /dev/null +++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml @@ -0,0 +1,30 @@ + + + + \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint index 42e1dc85d..af71be536 100755 --- a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint +++ b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint @@ -25,7 +25,7 @@ chown $user:$user /home/$user chmod 755 /home/$user ln -s /pycharm_helpers/ /home/$user/.pycharm_helpers -chown $user:$user /pycharm_helpers/ /home/$user/.pycharm_helpers +chown -R $user:$user /pycharm_helpers/ /home/$user/.pycharm_helpers # TODO: get public key authorization to work mkdir /home/$user/.ssh diff --git a/{{cookiecutter.repo_name}}/debug.yml b/{{cookiecutter.repo_name}}/debug.yml index 69fa522b7..a548d2c79 100644 --- a/{{cookiecutter.repo_name}}/debug.yml +++ b/{{cookiecutter.repo_name}}/debug.yml @@ -13,9 +13,15 @@ debug: - "2222:22" volumes: - .:/app - - /data/{{cookiecutter.repo_name}}/pycharm_helpers:/pycharm_helpers/ + volumes_from: + - pycharmhelpers environment: SFTP_USER: docker SFTP_PASS: docker links: - postgres + +pycharmhelpers: + image: pcdocker/pycharm_helpers + volumes: + - /pycharm_helpers