mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-07-31 10:19:54 +03:00
almost final changes
This commit is contained in:
parent
672f37ed08
commit
103e173994
|
@ -44,3 +44,17 @@ if not pycharm:
|
|||
shutil.rmtree(os.path.join(project_directory, path))
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
|
||||
import fileinput
|
||||
|
||||
jdk_table_xml = os.path.join(project_directory, 'compose/pycharm/jdk.table.xml')
|
||||
jdk_table_dst_dir = os.path.join(os.path.expanduser('~'), '.PyCharm40/config/options/')
|
||||
|
||||
for line in fileinput.input(jdk_table_xml, inplace=True):
|
||||
print line.replace('$PROJECT_DIR$', project_directory),
|
||||
|
||||
|
||||
if not os.path.exists(jdk_table_dst_dir):
|
||||
os.makedirs(jdk_table_dst_dir)
|
||||
shutil.copy2(jdk_table_xml, jdk_table_dst_dir)
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="[edit to activate] Docker: createsuperuser" type="Python.DjangoServer" factoryName="Django server" singleton="true">
|
||||
<configuration default="false" name="Docker: createsuperuser" type="Python.DjangoServer" factoryName="Django server" singleton="true">
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
<envs>
|
||||
<env name="PYTHONUNBUFFERED" value="1" />
|
||||
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
|
||||
</envs>
|
||||
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="SDK_HOME" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<option name="IS_MODULE_SDK" value="false" />
|
||||
<option name="IS_MODULE_SDK" value="true" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||
<module name="coco_repo" />
|
||||
<module name="{{ cookiecutter.repo_name }}" />
|
||||
<PathMappingSettings>
|
||||
<option name="pathMappings">
|
||||
<list>
|
|
@ -1,17 +1,17 @@
|
|||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="[edit to activate] Docker: migrate" type="Python.DjangoServer" factoryName="Django server" singleton="true">
|
||||
<configuration default="false" name="Docker: migrate" type="Python.DjangoServer" factoryName="Django server" singleton="true">
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
<envs>
|
||||
<env name="PYTHONUNBUFFERED" value="1" />
|
||||
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
|
||||
</envs>
|
||||
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<option name="IS_MODULE_SDK" value="false" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||
<module name="coco_repo" />
|
||||
<module name="{{ cookiecutter.repo_name }}" />
|
||||
<PathMappingSettings>
|
||||
<option name="pathMappings">
|
||||
<list>
|
|
@ -1,17 +1,17 @@
|
|||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="[edit to activate] Docker: runserver" type="Python.DjangoServer" factoryName="Django server" singleton="true">
|
||||
<configuration default="false" name="Docker: runserver" type="Python.DjangoServer" factoryName="Django server" singleton="true">
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
<envs>
|
||||
<env name="PYTHONUNBUFFERED" value="1" />
|
||||
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
|
||||
</envs>
|
||||
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<option name="IS_MODULE_SDK" value="false" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||
<module name="coco_repo" />
|
||||
<module name="{{ cookiecutter.repo_name }}" />
|
||||
<PathMappingSettings>
|
||||
<option name="pathMappings">
|
||||
<list>
|
|
@ -1,17 +1,17 @@
|
|||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="[edit to activate] Docker: runserver_plus" type="Python.DjangoServer" factoryName="Django server" singleton="true">
|
||||
<configuration default="false" name="Docker: runserver_plus" type="Python.DjangoServer" factoryName="Django server" singleton="true">
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
<envs>
|
||||
<env name="PYTHONUNBUFFERED" value="1" />
|
||||
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
|
||||
</envs>
|
||||
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<option name="IS_MODULE_SDK" value="false" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||
<module name="coco_repo" />
|
||||
<module name="{{ cookiecutter.repo_name }}" />
|
||||
<PathMappingSettings>
|
||||
<option name="pathMappings">
|
||||
<list>
|
|
@ -1,17 +1,17 @@
|
|||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="[edit to activate] Docker: tests - all" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
|
||||
<configuration default="false" name="Docker: tests - all" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
<envs>
|
||||
<env name="PYTHONUNBUFFERED" value="1" />
|
||||
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
|
||||
</envs>
|
||||
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<option name="IS_MODULE_SDK" value="false" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||
<module name="coco_repo" />
|
||||
<module name="{{ cookiecutter.repo_name }}" />
|
||||
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
|
||||
<PathMappingSettings>
|
||||
<option name="pathMappings">
|
|
@ -1,17 +1,17 @@
|
|||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="[edit to activate] Docker: tests - users" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
|
||||
<configuration default="false" name="Docker: tests - users" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
<envs>
|
||||
<env name="PYTHONUNBUFFERED" value="1" />
|
||||
<env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
|
||||
</envs>
|
||||
<option name="SDK_HOME" value="ssh://docker@localhost:2222/usr/local/bin/python" />
|
||||
<option name="SDK_HOME" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<option name="IS_MODULE_SDK" value="false" />
|
||||
<option name="IS_MODULE_SDK" value="true" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||
<module name="coco_repo" />
|
||||
<module name="{{ cookiecutter.repo_name }}" />
|
||||
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
|
||||
<PathMappingSettings>
|
||||
<option name="pathMappings">
|
||||
|
@ -20,7 +20,7 @@
|
|||
</list>
|
||||
</option>
|
||||
</PathMappingSettings>
|
||||
<option name="TARGET" value=" wawel_repo.users" />
|
||||
<option name="TARGET" value="{{ cookiecutter.repo_name }}.users" />
|
||||
<option name="SETTINGS_FILE" value="" />
|
||||
<option name="CUSTOM_SETTINGS" value="false" />
|
||||
<option name="USE_OPTIONS" value="false" />
|
|
@ -12,7 +12,7 @@
|
|||
</component>
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="jdk" jdkName="Remote Python 2.7.9 (sftp://docker@localhost:2222/usr/local/bin/python)" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
<component name="TemplatesService">
|
||||
|
|
|
@ -22,17 +22,14 @@ fi
|
|||
|
||||
useradd $useraddOptions $user
|
||||
|
||||
ln -s /pycharm_helpers/ /home/$user/.pycharm_helpers
|
||||
chown -R $user:$user /pycharm_helpers/
|
||||
|
||||
mkdir /home/$user/.ssh
|
||||
cat /ssh_id_rsa.pub > /home/$user/.ssh/authorized_keys
|
||||
|
||||
chown $user:$user /home/$user
|
||||
chmod 755 /home/$user
|
||||
chmod 700 /home/$user/.ssh
|
||||
700 /home/docker/.ssh
|
||||
600 /home/docker/.ssh/authorized_keys
|
||||
chmod 700 /home/docker/.ssh
|
||||
chmod 600 /home/docker/.ssh/authorized_keys
|
||||
|
||||
chown -R $user:$user /home/$user/
|
||||
|
||||
|
|
19
{{cookiecutter.repo_name}}/compose/pycharm/jdk.table.xml
Normal file
19
{{cookiecutter.repo_name}}/compose/pycharm/jdk.table.xml
Normal file
|
@ -0,0 +1,19 @@
|
|||
<application>
|
||||
<component name="ProjectJdkTable">
|
||||
<jdk version="2">
|
||||
<name value="Remote Python 2.7.9 (ssh://docker@localhost:2222/usr/local/bin/python)" />
|
||||
<type value="Python SDK" />
|
||||
<homePath value="ssh://docker@localhost:2222/usr/local/bin/python" />
|
||||
<roots>
|
||||
<classPath>
|
||||
<root type="composite" />
|
||||
</classPath>
|
||||
<sourcePath>
|
||||
<root type="composite" />
|
||||
</sourcePath>
|
||||
</roots>
|
||||
<additional HOST="localhost" PORT="2222" ANONYMOUS="false" USERNAME="docker" PASSWORD="" PRIVATE_KEY_FILE="$PROJECT_DIR$/compose/pycharm/.ssh_keys_to_docker/id_rsa" MY_KNOWN_HOSTS_FILE="" PASSPHRASE="" USE_KEY_PAIR="true" INTERPRETER_PATH="/usr/local/bin/python" HELPERS_PATH="/home/docker/.pycharm_helpers/" INITIALIZED="false" VALID="true" SKELETONS_PATH="" />
|
||||
</jdk>
|
||||
</component>
|
||||
</application>
|
||||
|
|
@ -13,15 +13,8 @@ debug:
|
|||
- "2222:22"
|
||||
volumes:
|
||||
- .:/app
|
||||
volumes_from:
|
||||
- pycharmhelpers
|
||||
environment:
|
||||
SFTP_USER: docker
|
||||
SFTP_PASS: docker
|
||||
links:
|
||||
- postgres
|
||||
|
||||
pycharmhelpers:
|
||||
image: pcdocker/pycharm_helpers
|
||||
volumes:
|
||||
- /pycharm_helpers
|
||||
|
|
Loading…
Reference in New Issue
Block a user