Merge branch 'develop' into release

Author: LoicDelorme

.travis.yml

@@ -17,7 +17,6 @@ script:
 after_success:
  - if [ "$TRAVIS_BRANCH" == "master" ]; then
     docker build -t $DOCKER_USERNAME/cryptowallet-backend .;
-    echo "Testing Docker Hub credentials...";
     docker login -u=$DOCKER_USERNAME -p=$DOCKER_PASSWORD;
     echo "Docker Hub credentials are working";
     docker push $DOCKER_USERNAME/cryptowallet-backend;

BDD_V1.4.png

@@ -11,7 +11,7 @@
 - LAFAYE DE MICHEAUX Yoan
 
 ## Global database scheme
-![](BDD_V1.4.png)
+![](BDD_V1.5.png)
 
 ## Getting started
 - Clone Polytech-CryptoWallet-Backend project

BDD_V1.5.png

@@ -9,14 +9,50 @@ services:
     volumes:
       - ./data/mysql:/var/lib/mysql
       - ./config/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+    ports:
+      - "3306:3306"
 
   cryptowallet-backend-container:
-      container_name: "cryptowallet-backend-container"
-      depends_on:
-        - mysql-db-container
-      image: delormeloic26/cryptowallet-backend
-      links:
-        - mysql-db-container
-      ports:
-        - "80:8090"
-      restart: always
+    container_name: cryptowallet-backend-container
+    depends_on:
+      - mysql-db-container
+    image: delormeloic26/cryptowallet-backend
+    links:
+      - mysql-db-container
+    restart: always
+    environment:
+      - VIRTUAL_PORT=8090
+      - VIRTUAL_HOST=cryptowallet.loic-delorme.fr
+      - VIRTUAL_PROTO=https
+      - LETSENCRYPT_HOST=cryptowallet.loic-delorme.fr
+      - LETSENCRYPT_EMAIL=loic.delorme.pro@gmail.com
+
+  cryptowallet-nginx-proxy-container:
+    container_name: cryptowallet-nginx-proxy-container
+    depends_on:
+      - cryptowallet-backend-container
+    image: jwilder/nginx-proxy:alpine
+    restart: always
+    environment:
+      - ENABLE_IPV6=true
+      - HTTPS_METHOD=nohttp
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./config/nginx/certs:/etc/nginx/certs:ro
+      - /etc/nginx/vhost.d
+      - /usr/share/nginx/html
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+
+  cryptowallet-nginx-proxy-companion-container:
+    container_name: cryptowallet-nginx-proxy-companion-container
+    depends_on:
+      - cryptowallet-backend-container
+    image: jrcs/letsencrypt-nginx-proxy-companion
+    restart: always
+    volumes:
+      - ./config/nginx/certs:/etc/nginx/certs:rw
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    volumes_from:
+      - cryptowallet-nginx-proxy-container

README.md

@@ -5,7 +5,7 @@
 
     <groupId>fr.polytech</groupId>
     <artifactId>cryptowallet-backend</artifactId>
-    <version>1.2.1</version>
+    <version>1.5</version>
     <packaging>jar</packaging>
 
     <name>Polytech-Codev-Backend</name>

config/mysql/docker-entrypoint-initdb.d/CREATE_ALL.sql

@@ -3,10 +3,14 @@ USE CryptoWallet;
 DELETE FROM assets;
 DELETE FROM wallets;
 DELETE FROM alerts;
-DELETE FROM settings;
 DELETE FROM tokens;
 DELETE FROM logs;
+DELETE FROM devices;
 DELETE FROM favorites;
 DELETE FROM users;
+DELETE FROM settings;
 DELETE FROM alert_types;
-DELETE FROM cryptocurrencies;
+DELETE FROM cryptocurrencies;
+DELETE FROM chart_periods;
+DELETE FROM currencies;
+DELETE FROM themes;

config/nginx/certs/.gitkeep

@@ -3,10 +3,14 @@ USE CryptoWallet;
 DROP TABLE assets;
 DROP TABLE wallets;
 DROP TABLE alerts;
-DROP TABLE settings;
 DROP TABLE tokens;
 DROP TABLE logs;
+DROP TABLE devices;
 DROP TABLE favorites;
 DROP TABLE users;
+DROP TABLE settings;
 DROP TABLE alert_types;
-DROP TABLE cryptocurrencies;
+DROP TABLE cryptocurrencies;
+DROP TABLE chart_periods;
+DROP TABLE currencies;
+DROP TABLE themes;