Compare commits

..

3 Commits

Author SHA1 Message Date
andrey 98769e9817 correct docker 2024-01-26 05:14:54 +00:00
andrey e89d368113 Merge branch 'master' of https://git.myterior.kz/Lowlight_Akbota/NitakuShop 2024-01-26 04:53:47 +00:00
andrey bc95cb6073 settings 2024-01-26 04:52:16 +00:00
9 changed files with 7 additions and 72 deletions

8
.idea/.gitignore vendored
View File

@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="FacetManager">
<facet type="django" name="Django">
<configuration>
<option name="rootFolder" value="$MODULE_DIR$" />
<option name="settingsModule" value="NITAKUSHOP/settings.py" />
<option name="manageScript" value="$MODULE_DIR$/manage.py" />
<option name="environment" value="&lt;map/&gt;" />
<option name="doNotUseTestRunner" value="false" />
<option name="trackFilePattern" value="migrations" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/venv" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TemplatesService">
<option name="TEMPLATE_CONFIGURATION" value="Django" />
<option name="TEMPLATE_FOLDERS">
<list>
<option value="$USER_HOME$/NITAKUSHOP\templates" />
</list>
</option>
</component>
</module>

View File

@ -1,6 +0,0 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Black">
<option name="sdkName" value="Python 3.11 (NITAKUSHOP) (2)" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (NITAKUSHOP) (2)" project-jdk-type="Python SDK" />
</project>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/NITAKUSHOP.iml" filepath="$PROJECT_DIR$/.idea/NITAKUSHOP.iml" />
</modules>
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -1,6 +1,6 @@
# Dockerfile # Dockerfile
# Pull the base image # Pull the base image
FROM python:3.10 FROM python:3.11.7-slim-bookworm
# Set environment variables # Set environment variables
ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONDONTWRITEBYTECODE 1
@ -17,5 +17,5 @@ RUN pip install -r requirements.txt
COPY . /code/ COPY . /code/
# Run migrations # Run migrations
RUN python manage.py makemigrations # RUN python manage.py makemigrations
RUN python manage.py migrate RUN python manage.py migrate

View File

@ -25,7 +25,7 @@ SECRET_KEY = 'django-insecure-&b24xw3mg)lbuo4pdea^cxgkoc!yace&t^o9*o#n=-_jhwe+x!
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = [] ALLOWED_HOSTS = ['192.168.0.172', 'nitakushop.silkyway.kz']
# Application definition # Application definition

View File

@ -8,6 +8,6 @@ services:
volumes: volumes:
- .:/code - .:/code
ports: ports:
- ${PORT}:${PORT} - 32774:${PORT}
env_file: env_file:
- .env - .env