Browse Source

add .env file

abdofarag 5 years ago
parent
commit
1ee3734f2c
5 changed files with 33 additions and 25 deletions
  1. 15 0
      .env-examble
  2. 1 0
      .gitignore
  3. 12 10
      docker-back/requirements.txt
  4. 2 1
      docker-compose.yml
  5. 3 14
      setup.sh

+ 15 - 0
.env-examble

@@ -0,0 +1,15 @@
+#!/bin/bash
+## Your Gogs username 
+GIT_USER=gogs_username
+## Your Gogs password 
+GIT_PASS=gogs_password
+## Your vm or server ip address.
+IP_ADDR=Server_IP
+
+## User used on whole setup 
+ADMIN_USER=admin
+## Password used on whole setup 
+ADMIN_PASS=gW3KSoZt5K5o9V99YJUH
+
+export USER=$ADMIN_USER
+export PASS=$ADMIN_PASS

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+.env

+ 12 - 10
docker-back/requirements.txt

@@ -1,9 +1,9 @@
-amqp==1.4.9
+amqp==2.3.2
 anyjson==0.3.3
 asn1crypto==0.24.0
 Babel==2.6.0
-billiard==3.3.0.23
-celery==3.1.26.post2
+billiard==3.5.0.4
+celery==4.2.0
 certifi==2018.1.18
 cffi==1.11.5
 chardet==3.0.4
@@ -12,10 +12,10 @@ coreapi==2.3.3
 coreschema==0.0.4
 cryptography==2.2.2
 defusedxml==0.5.0
-Django==2.0.3
+Django==2.0.7
 django-allauth==0.35.0
 django-appconf==1.0.2
-django-celery==3.2.2
+django-celery-beat==1.1.1
 django-cors==0.1
 django-cors-headers==2.2.0
 django-hashers-passlib==0.4
@@ -24,13 +24,14 @@ django-oauth-toolkit==1.0.0
 django-redis==4.9.0
 django-rest-auth==0.9.3
 django-rest-framework==0.1.0
+django-webpush==0.2.5
 djangorestframework==3.8.2
 djangorestframework-jwt==1.11.0
 drf-yasg==1.6.2
-flex==6.13.1
+flex==6.13.2
 flower==0.9.2
 future==0.16.0
-gunicorn==19.8.1
+gunicorn==19.9.0
 http-ece==1.0.5
 idna==2.6
 inflection==0.3.1
@@ -38,7 +39,7 @@ itypes==1.1.0
 Jinja2==2.10
 jsonpointer==1.14
 jsonschema==2.6.0
-kombu==3.0.37
+kombu==4.2.1
 MarkupSafe==1.0
 mysqlclient==1.3.12
 oauthlib==2.0.7
@@ -48,12 +49,13 @@ pilkit==2.0
 Pillow==5.1.0
 py-vapid==1.4.0
 pycparser==2.18
+pygogo==0.12.0
 PyJWT==1.6.1
+python-memcached==1.59
 python-mimeparse==1.6.0
-python_memcached==1.59
 python3-openid==3.1.0
 pytz==2018.3
-pywebpush==1.7.0
+pywebpush==1.6.0
 PyYAML==3.13
 redis==2.10.6
 requests==2.18.4

+ 2 - 1
docker-compose.yml

@@ -7,7 +7,8 @@ services:
     build: docker-back/ 
     image: barcode-back
     container_name: "barcode-back"
-    command: bash -c "python manage.py runserver 0.0.0.0:8000" 
+    #command: bash -c "python manage.py runserver 0.0.0.0:8000" 
+    command: bash -c "gunicorn -w 4 -b 0.0.0.0:8000 barcode.wsgi:application --log-level=info --log-file=/back/gunicorn.log --access-logfile=/back/gunicorn-access.log"
     ports:
       - "8000:8000"
     volumes:

+ 3 - 14
setup.sh

@@ -1,18 +1,7 @@
 #!/bin/bash
-## Your Gogs username 
-GIT_USER=gogs_username
-## Your Gogs password 
-GIT_PASS=gogs_password
-## Your vm or server ip address.
-IP_ADDR=Server_IP
-
-## User used on whole setup 
-ADMIN_USER=admin
-## Password used on whole setup 
-ADMIN_PASS=gW3KSoZt5K5o9V99YJUH
-
-export USER=$ADMIN_USER
-export PASS=$ADMIN_PASS
+## Import .env file
+
+source .env 
 
 
 ##Install docker adnd docker-compose