diff --git a/canapEPFL/Dockerfile-canap-form b/canapEPFL/Dockerfile-canap-form
new file mode 100644
index 0000000000000000000000000000000000000000..5c2e055a9ae0161bab7e9d3f3b9ba437a944c09e
--- /dev/null
+++ b/canapEPFL/Dockerfile-canap-form
@@ -0,0 +1,27 @@
+FROM php:7-apache
+
+RUN apt-get update;
+RUN apt-get install -f -y msmtp msmtp-mta;
+
+RUN echo 'sendmail_path = "/usr/bin/msmtp -C /etc/msmtprc -t"' >> /usr/local/etc/php/php.ini
+RUN echo 'sendmail_from = "noreply@epfl.ch"' >> /usr/local/etc/php/php.ini
+RUN touch /etc/msmtprc
+RUN echo "defaults" > /etc/msmtprc
+RUN echo "logfile        /var/log/msmtp.log" >> /etc/msmtprc
+RUN echo "" >> /etc/msmtprc
+RUN echo "account        epfl" >> /etc/msmtprc
+RUN echo "host           mail.epfl.ch" >> /etc/msmtprc
+RUN echo "port           25" >> /etc/msmtprc
+RUN echo "from           noreply@epfl.ch" >> /etc/msmtprc
+RUN echo "" >> /etc/msmtprc
+RUN echo "account default : epfl" >> /etc/msmtprc
+
+
+#php -r "mail('nicolas.borboen@epfl.ch', 'Test Postfix', 'Test mail from postfix');"
+
+
+RUN docker-php-ext-install pdo_mysql
+
+# cleanup
+RUN apt-get -y autoremove && apt-get -y clean;
+
diff --git a/canapEPFL/docker-compose.yml b/canapEPFL/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2d3eb45bcf83b55df5033b8fc8000c455e4260e7
--- /dev/null
+++ b/canapEPFL/docker-compose.yml
@@ -0,0 +1,32 @@
+version: '3'
+
+services:
+  db:
+    image: mysql:5.7
+    container_name: canap_db
+    environment:
+      MYSQL_ROOT_PASSWORD: canap_db
+      MYSQL_DATABASE: canap_db
+      MYSQL_USER: canap_db
+      MYSQL_PASSWORD: canap_db
+    volumes:
+      - ./DB/SQL:/docker-entrypoint-initdb.d
+      - ./DB/data:/var/lib/mysql
+    ports:
+      - "9906:3306"
+    expose:
+      - 9906
+  form:
+    build:
+      context: ./
+      dockerfile: Dockerfile-canap-form
+    container_name: canap_form
+    depends_on:
+      - db
+    volumes:
+      - .:/var/www/html/
+    ports:
+      - "8180:80"
+    stdin_open: true
+    tty: true
+