diff --git a/.gitignore b/.gitignore index b6e4761..eff900d 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,7 @@ dmypy.json # Pyre type checker .pyre/ + +# postgres +./Postgres +Postgres/* diff --git a/DjangoFiles/TiBillet/settings.py b/DjangoFiles/TiBillet/settings.py index b959cc6..9ca15bd 100644 --- a/DjangoFiles/TiBillet/settings.py +++ b/DjangoFiles/TiBillet/settings.py @@ -241,23 +241,24 @@ LOGGING = { 'class': 'logging.StreamHandler', 'formatter': 'simple', }, - 'logfile': { - 'level': 'INFO', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': f"{BASE_DIR}/www/Djangologfile", - 'formatter': 'simple', - 'maxBytes': 1024 * 1024 * 100, # 100 mb - }, - 'weasyprint': { - 'level': 'ERROR', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': f"{BASE_DIR}/www/weasyprint", - 'formatter': 'simple', - 'maxBytes': 1024 * 1024 * 100, # 100 mb - }, + # 'logfile': { + # 'level': 'INFO', + # 'class': 'logging.handlers.RotatingFileHandler', + # 'filename': f"{BASE_DIR}/www/Djangologfile", + # 'formatter': 'simple', + # 'maxBytes': 1024 * 1024 * 100, # 100 mb + # }, + # 'weasyprint': { + # 'level': 'ERROR', + # 'class': 'logging.handlers.RotatingFileHandler', + # 'filename': f"{BASE_DIR}/www/weasyprint", + # 'formatter': 'simple', + # 'maxBytes': 1024 * 1024 * 100, # 100 mb + # }, }, 'root': { 'level': 'INFO', - 'handlers': ['console', 'logfile', 'weasyprint'] + # 'handlers': ['console', 'logfile', 'weasyprint'] + 'handlers': ['console'] }, } \ No newline at end of file diff --git a/DjangoFiles/launch.sh b/DjangoFiles/launch.sh index 8366696..3b691eb 100755 --- a/DjangoFiles/launch.sh +++ b/DjangoFiles/launch.sh @@ -1,3 +1 @@ -sleep 30d - -# celery -A TiBillet worker -l INFO \ No newline at end of file +sleep 30d \ No newline at end of file diff --git a/Docker/Development/docker-compose.yml b/Docker/Development/docker-compose.yml index e3fb4a0..6680889 100644 --- a/Docker/Development/docker-compose.yml +++ b/Docker/Development/docker-compose.yml @@ -21,7 +21,7 @@ services: extends: file: ../compose/docker-compose-base.yml service: billetterie_django - command: "bash /DjangoFiles/launch.sh" + command: "sleep 30d" env_file: .env ports: - 8002:8002 @@ -50,23 +50,23 @@ services: - backend-billeterie - billetterie_nginx_dev: - extends: - file: ../compose/docker-compose-base.yml - service: billetterie_nginx + # billetterie_nginx_dev: + # extends: + # file: ../compose/docker-compose-base.yml + # service: billetterie_nginx - env_file: .env - depends_on: - - billetterie_django_dev - links: - - billetterie_django_dev:billetterie_django - labels: - - traefik.enable=true - - traefik.docker.network=frontend - - traefik.http.routers.billeterie_nginx.tls.certresolver=myresolver - - traefik.http.routers.billeterie_nginx.rule=Host(`m.${DOMAIN}`) || Host(`www.${DOMAIN}`) || Host(`raffinerie.${DOMAIN}`) || Host(`bisik.${DOMAIN}`) || Host(`vavangart.${DOMAIN}`) || Host(`manapany.${DOMAIN}`) || Host(`demo.${DOMAIN}`) || Host(`${DOMAIN}`) - networks: - - frontend + # env_file: .env + # depends_on: + # - billetterie_django_dev + # links: + # - billetterie_django_dev:billetterie_django + # labels: + # - traefik.enable=true + # - traefik.docker.network=frontend + # - traefik.http.routers.billeterie_nginx.tls.certresolver=myresolver + # - traefik.http.routers.billeterie_nginx.rule=Host(`m.${DOMAIN}`) || Host(`www.${DOMAIN}`) || Host(`raffinerie.${DOMAIN}`) || Host(`bisik.${DOMAIN}`) || Host(`vavangart.${DOMAIN}`) || Host(`manapany.${DOMAIN}`) || Host(`demo.${DOMAIN}`) || Host(`${DOMAIN}`) + # networks: + # - frontend # pour demo : jturbeaux@pm.me / eiXom5mo diff --git a/Docker/Development/env_example b/Docker/Development/env_example index b43c8d4..7e9fc51 100644 --- a/Docker/Development/env_example +++ b/Docker/Development/env_example @@ -1,7 +1,7 @@ # CHANGE ME DJANGO_SECRET='ingeci8ar6Ahr6aiBi!ghovezahs@eiNgai4eingaa1zaeRi7E' -POSTGRES_HOST='tibillet_postgres' +POSTGRES_HOST='billetterie_postgres' POSTGRES_USER='tibillet_postgres_user' POSTGRES_PASSWORD='tibillet_postgres_password' POSTGRES_DB='tibillet' diff --git a/Docker/Dockerfile/dockerfile b/Docker/Dockerfile/dockerfile index 1df7104..52a0104 100644 --- a/Docker/Dockerfile/dockerfile +++ b/Docker/Dockerfile/dockerfile @@ -9,16 +9,16 @@ RUN pip install pip --upgrade ## PYTHON RUN pip install django==2.2 -RUN pip install djangorestframework==3.11 -RUN pip install requests +RUN pip install django-admin-sortable2==1.0.2 +RUN pip install djangorestframework RUN pip install django-jet +RUN pip install requests RUN pip install gunicorn RUN pip install django-admin-rangefilter RUN pip install sentry-sdk RUN pip install python-dateutil RUN pip install Werkzeug RUN pip install django-solo -RUN pip install django-admin-sortable2 RUN pip install admin-totals RUN pip install django-tenants RUN pip install mollie-api-python @@ -83,3 +83,8 @@ RUN python --version RUN django-admin --version RUN pip freeze +# docker build -t production_billetterie_django_demo:2.8-bullyeses_python38 . +# docker tag production_billetterie_django_demo registry.3peaks.re/billetterie_django:2.8-bullyeses_python38_prelog4s +# docker push registry.3peaks.re/billetterie_django:2.8-bullyeses_python38_prelog4s + +# docker pull docker push registry.3peaks.re/billetterie_django:2.8-bullyeses_python38_prelog4s \ No newline at end of file diff --git a/Docker/compose/docker-compose-base.yml b/Docker/compose/docker-compose-base.yml index b2872d6..153a33a 100644 --- a/Docker/compose/docker-compose-base.yml +++ b/Docker/compose/docker-compose-base.yml @@ -21,6 +21,7 @@ services: billetterie_django: container_name: billetterie_django build: ../Dockerfile/ +# image: registry.3peaks.re/billetterie_django:2.8-bullyeses_python38_prelog4s restart: always # ports: # - 8002:8002 @@ -34,6 +35,7 @@ services: billetterie_celery: container_name: billetterie_celery build: ../Dockerfile/ +# image: registry.3peaks.re/billetterie_django:2.8-bullyeses_python38_prelog4s restart: always volumes: - "../../DjangoFiles:/DjangoFiles" @@ -42,6 +44,7 @@ services: # command: "bash /DjangoFiles/launch.sh" + billetterie_nginx: container_name: billetterie_nginx image: nginx diff --git a/windows install fr.md b/windows install fr.md new file mode 100644 index 0000000..9318e39 --- /dev/null +++ b/windows install fr.md @@ -0,0 +1,102 @@ +# Installation Windows et contribuer avec VSC : + +### Installer VSC +https://code.visualstudio.com + +### Intaller Git +https://git-scm.com/download/win + +### Installer Docker +https://docs.docker.com/desktop/windows/install/ + +### Mettre a jour le kernel WSL +https://docs.microsoft.com/fr-fr/windows/wsl/install-manual#step-4---download-the-linux-kernel-update-package + +### dans power shell ( touche windows + x -> powershell admin) : +``` +wsl --set-default-version 2 +``` + +### modifier le etc/hosts +Avec les droits admin, modifier le fichier suivant : +```C:\Windows\System32\drivers\etc\hosts``` + +rajoutez à la fin : +``` +# TiBillet Dev +127.0.0.1 tibillet-local.me +127.0.0.1 www.tibillet-local.me +127.0.0.1 demo.tibillet-local.me +``` + +## Récuperer le projet + +Créer un compte github +Lancer VSC +Clonez un dépot avec l'adresse : ```https://github.com/Nasjoe/TiBillet-Ticket``` + +Autorisez VSC a se connecter avec son compte github + +Dans VSC, icone extension, installer : +``` +Docker - Par microsoft +Django - Par Baptiste Darthenay +``` + +## Configurer docker +ouvrir un terminal dans VSC : + + +``` +docker network create frontend +``` + + +Toujours dans le même terminal, notifiez à Git qui vous êtes : +``` +git config --global user.email "moi@moi.me" +git config --global user.name "Moi Windows VSC" +``` + + +### Copier les variables d'environement utiles au projet +Dans l'explorateur de gauche, ouvrir Docker/Development. + +Copier / coller env_example en env_example_copy + +renommer env_example_copy en .env + +### Construire et lancer les conteneurs +clic droit sur docker-compose.yml -> Compose Up + +Une fois terminé, si le parefeu windows se lance, cocher et accepter tout. + +### Entrer dans le conteneur qui fait tourner l'application +Allez sur l'onglet docker de VSC + +Dans la partie CONTAINERS, clic droit sur billetterie_django -> attach shel + +### Créer la base de donnée et le super utilisateur +Dans le terminal qui s'ouvre: +``` +python manage.py migrate +python manage.py createdemo +python manage.py create_tenant_superuser + -> public +``` +Bien entrer nom, email et mot de passe. + +### lancer l'application +Toujours dans le conteneur : +``` +python /DjangoFiles/manage.py runserver_plus 0.0.0.0:8002 +``` + +### +Sur votre navigateur, aller sur : +http://demo.tibillet-local.me:8002 + +Pour l'admin : +http://demo.tibillet-local.me:8002/admin + +avec email / password créé plus haut \ No newline at end of file