varios update

Makefile

@@ -10,7 +10,7 @@ run:
 	docker run -it --name blade-api -d -p 5000:5000 bladesorbonne/blade-img-api
 	docker run -it --name blade-front -d -p 3000:3000 bladesorbonne/blade-img-front
 
-#push:
-#	docker push bladesorbonne/blade-img
-
+push:
+	docker push bladesorbonne/blade-img-api
+	docker push bladesorbonne/blade-img-front
 

blade/front/Dockerfile

@@ -1,7 +1,8 @@
 FROM node:10
 WORKDIR /blade/front
-COPY . .
+COPY package.json .
 RUN npm install
+COPY . .
 EXPOSE 3000
 CMD ["npm", "start"]
 

blade/front/src/components/pages/Publications/Publications.js

@@ -15,6 +15,22 @@ class Publications extends PureComponent {
             <div className="publications">
                 <Container>
                     <h1 className="section-title display-4">Associated publications</h1>
+                    <div className="list-group group-inputs">
+                        <a href="https://arxiv.org/pdf/2101.08997" className="list-group-item list-group-item-action">
+                             Nicolas Six, Claudia Negri Ribalta, Nicolas Herbaut, Camille Salinesi
+                            "A blockchain-based pattern for confidential and pseudo-anonymous contract enforcement"
+                            2020 IEEE 19th International Conference on Trust, Security and Privacy in Computing and Communications (TrustCom)
+                        </a>
+                    </div>
+
+                        <div className="list-group group-inputs">
+                        <a href="https://www.openscience.fr/BLADE-Un-outil-d-aide-a-la-decision-automatique-pour-guider-le-choix-de" className="list-group-item list-group-item-action">
+                             N Six, N Herbaut, C Salinesi
+                            "BLADE: Un outil d’aide à la décision automatique pour guider le choix de technologie Blockchain"
+                            Revue ouverte d’ingénierie des systèmes d’information 2 (1)
+                        </a>
+                    </div>
+
                     <div className="list-group group-inputs">
                         <a href="http://ceur-ws.org/Vol-2613/" className="list-group-item list-group-item-action">
                             Six, Nicolas. 

blade/front/src/static/js/variables.js

@@ -1 +1 @@
-exports.apiUrl = "http://localhost:5000";
+exports.apiUrl = "https://recommender-api.blade-blockchain.eu";

docker-compose.yml

@@ -0,0 +1,59 @@
+version: '3.3'
+services:
+  traefik:
+    image: traefik:v2.4
+    command:
+            #- "--api.insecure=true"
+        #      - "--accesslog=true"
+      - "--providers.docker=true"
+      - "--providers.docker.exposedbydefault=false"
+      - "--entrypoints.websecure.address=:443"
+      - "--certificatesresolvers.myresolver.acme.tlschallenge=true"
+      - "--certificatesresolvers.myresolver.acme.email=nicolas.herbaut@gmail.com"
+      - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
+        #      - "--log.level=DEBUG"
+    ports:
+      - "443:443"
+      - "8080:8080"
+    volumes:
+      - "./letsencrypt:/letsencrypt"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "/var/log/traefik/:/var/log"
+
+
+  blade-front:
+    image: bladesorbonne/blade-img-front
+    container_name: blade-front
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.blade-front.tls.certresolver=myresolver"
+      - "traefik.http.routers.blade-front.rule=host(`recommender.blade-blockchain.eu`)"
+      - "traefik.http.routers.blade-front.entrypoints=websecure"
+      - "traefik.http.services.blade-front.loadbalancer.server.port=3000"
+    expose:
+      - "3000"
+    stdin_open: #gross haack for react webapp
+      true
+    ports:
+      - "3000:3000"
+    depends_on:
+      - blade-api
+  blade-api:
+    image: bladesorbonne/blade-img-api
+    container_name: blade-api
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.blade-api.tls.certresolver=myresolver"
+      - "traefik.http.routers.blade-api.rule=host(`recommender-api.blade-blockchain.eu`)"
+      - "traefik.http.routers.blade-api.entrypoints=websecure"
+      - "traefik.http.services.blade-api.loadbalancer.server.port=5000"
+      - "traefik.http.middlewares.testheader.headers.accessControlAllowHeaders=content-type"
+      - "traefik.http.middlewares.testheader.headers.accesscontrolallowmethods=GET,OPTIONS,PUT,POST"
+      - "traefik.http.middlewares.testheader.headers.accesscontrolalloworiginlist=*"
+      - "traefik.http.middlewares.testheader.headers.accesscontrolmaxage=100"
+      - "traefik.http.middlewares.testheader.headers.addvaryheader=true"
+      - "traefik.http.routers.blade-api.middlewares=testheader@docker"
+    expose:
+      - "5000"
+    depends_on:
+      - traefik