build_docker.sh

@@ -1,5 +1,5 @@
 set -e
-version=2.1.0
+version=2.0.1
 docker build -t jeancloud/contact-mailer:latest -t jeancloud/contact-mailer:$version .
 docker push jeancloud/contact-mailer:latest
 docker push jeancloud/contact-mailer:$version

nginx.conf

@@ -22,17 +22,17 @@ http {
 server {
 	add_header 'Access-Control-Allow-Origin' '*';
 	add_header 'Access-Control-Allow-Methods' 'GET, POST, DELETE, OPTIONS';
-    listen 8080;
+    listen 8008;
     location /admin {
 	    root /home/ilya/git/contact_mailer/adminer;
 	    index index.html;
     }
     location / {
-        root /home/ilya/git/contact_mailer/test;
+        root /home/ilya/git/contact_mailer;
         index test.html;
     }
     location /api/ {
-    	proxy_pass http://mailer:8080/;
+    	proxy_pass http://localhost:8080/;
     }
 }
 }

server/Pipfile

@@ -1,13 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[dev-packages]
-
-[packages]
-email = "*"
-bottle = "*"
-
-[requires]
-python_version = "3.6"

test/docker-compose.yml

@@ -2,11 +2,11 @@ version: '3'
 services:
     db:
         image: mongo
-
+    
     mailer:
-        build: ../server
+        build: ..
         volumes:
-            - ../server/main.py:/usr/src/app/main.py
+            - ../main.py:/usr/src/app/main.py
             - ./uwsgi:/tmp/uwsgi
         depends_on:
             - db
@@ -19,10 +19,7 @@ services:
             SMTP_SERVER_SENDER: moi
             ADMIN_PASSWORD: admin
             SMTP_SSL: 'true'
-
     proxy:
         image: nginx
         ports:
             - 8080:8080
-        volumes:
-            - ./nginx.conf:/etc/nginx.conf