From 98dd239b781c7c2eeb3c9325d362b410f1d0a83a Mon Sep 17 00:00:00 2001
From: cazenave <cazenave@cines.fr>
Date: Thu, 20 Aug 2020 10:37:27 +0200
Subject: [PATCH] +dockerfile
---
DockerFile | 4 ----
conf/setting.json | 10 +++++-----
src/main/java/com/ffdsregisterapi/Controller.java | 12 +++++++++---
src/main/resources/application.properties | 1 +
4 files changed, 15 insertions(+), 12 deletions(-)
delete mode 100644 DockerFile
diff --git a/DockerFile b/DockerFile
deleted file mode 100644
index 4f1f5af..0000000
--- a/DockerFile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM openjdk:8-jdk-alpine
-ARG JAR_FILE=target/*.jar
-COPY ${JAR_FILE} app.jar
-ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file
diff --git a/conf/setting.json b/conf/setting.json
index b43aaa6..06a247c 100644
--- a/conf/setting.json
+++ b/conf/setting.json
@@ -1,7 +1,7 @@
{
- "fdpurl": "http://6ddrvi64oo.lb.c1.gra7.k8s.ovh.net",
- "fdpemail": "admin@cines-lab.fr",
- "fdppassword": "adminadmin",
- "elasticurl": "http://6ddrvi64oo.lb.c1.gra7.k8s.ovh.net",
- "smartapiurl": "http://6ddrvi64oo.lb.c1.gra7.k8s.ovh.net/toto"
+ "fdpurl": "http://172.17.0.3:30056",
+ "fdpemail": "albert.einstein@example.com",
+ "fdppassword": "password",
+ "elasticurl": "http://172.17.0.3:9200",
+ "smartapiurl": "http://172.17.0.3:30306"
}
diff --git a/src/main/java/com/ffdsregisterapi/Controller.java b/src/main/java/com/ffdsregisterapi/Controller.java
index 223bfd7..9476f27 100644
--- a/src/main/java/com/ffdsregisterapi/Controller.java
+++ b/src/main/java/com/ffdsregisterapi/Controller.java
@@ -9,10 +9,16 @@ import java.io.*;
@RestController
public class Controller {
- @CrossOrigin(origins = "http://localhost:4200")
+ @CrossOrigin(origins = "*")
+ @GetMapping(value = "/")
+ public String info() {
+ return "API ffds-resister-api";
+ }
+
+
+ @CrossOrigin(origins = "*")
@PostMapping (value="/api/setting")
public void result(@RequestBody String data) {
-
try{
File ff=new File("conf/setting.json");
ff.createNewFile();
@@ -24,7 +30,7 @@ public class Controller {
}
- @CrossOrigin(origins = "http://localhost:4200")
+ @CrossOrigin(origins = "*")
@GetMapping(value = "/api/setting/load", produces= MediaType.APPLICATION_JSON_VALUE)
public String setting() {
String chaine="";
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e69de29..f900456 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -0,0 +1 @@
+server.address=0.0.0.0
--
GitLab