Merge pull request #12 from skkuse/backend-docker

Backend docker
skkuse · Dec 12, 2023 · d6a9208 · d6a9208
2 parents 1b40328 + 761c340
commit d6a9208
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
diff --git a/backend/.DS_Store b/backend/.DS_Store
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -0,0 +1,22 @@
+# Set base image to Ubuntu
+FROM ubuntu:latest
+
+# Install OpenJDK 17
+RUN apt-get update && \
+    apt-get install -y openjdk-17-jdk && \
+    apt-get clean;
+
+# Set the working directory in the container
+WORKDIR /usr/src/app
+
+# Copy the current directory contents to the container at /usr/src/app
+COPY . /usr/src/app
+
+# Expose port 8000
+EXPOSE 8080
+
+# Start the Java application
+CMD ["java", "-jar", "/usr/src/app/build/libs/se7-0.0.1-SNAPSHOT.jar"]
+
+# If you want to keep the container running uncomment the following line
+#CMD tail -f /dev/null
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -24,8 +24,7 @@ ext {
 }
 
 test {
-	outputs.dir snippetsDir
-	useJUnitPlatform()
+	enabled = false
 }
 
 asciidoctor {

diff --git a/backend/gradlew b/backend/gradlew
diff --git a/backend/src/main/java/com/skku/se7/Se7Application.java b/backend/src/main/java/com/skku/se7/Se7Application.java
@@ -23,3 +23,4 @@ public void addCorsMappings(CorsRegistry registry) {
 		};
 	}
 }
+
diff --git a/backend/src/main/java/com/skku/se7/controller/GreenController.java b/backend/src/main/java/com/skku/se7/controller/GreenController.java
@@ -18,6 +18,7 @@
 @Slf4j
 @RestController
 @RequiredArgsConstructor
+@CrossOrigin(origins="*")
 public class GreenController {
     private final GreenService greenService;
     private final ProcessorTdpHandler processorTdpHandler;

diff --git a/backend/src/main/java/com/skku/se7/controller/ViewController.java b/backend/src/main/java/com/skku/se7/controller/ViewController.java
@@ -6,13 +6,16 @@
 import com.skku.se7.service.dataHandler.ProcessorTdpHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
 @RequiredArgsConstructor
+@CrossOrigin(origins="*")
 public class ViewController {
     private final ProcessorTdpHandler processorTdpHandler;
     private final LocationHandler locationHandler;

diff --git a/bin/com/skku/se7/Se7Application.class b/bin/com/skku/se7/Se7Application.class
diff --git a/bin/com/skku/se7/Se7ApplicationTests.class b/bin/com/skku/se7/Se7ApplicationTests.class
diff --git a/bin/com/skku/se7/controller/HelloController.class b/bin/com/skku/se7/controller/HelloController.class
diff --git a/bin/com/skku/se7/service/HelloService.class b/bin/com/skku/se7/service/HelloService.class
diff --git a/bin/com/skku/se7/service/JavaCodeCompiler.class b/bin/com/skku/se7/service/JavaCodeCompiler.class
diff --git a/bin/com/skku/se7/service/JavaRunner.class b/bin/com/skku/se7/service/JavaRunner.class
diff --git a/bin/com/skku/se7/service/ResourceProcessor.class b/bin/com/skku/se7/service/ResourceProcessor.class
diff --git a/bin/com/skku/se7/service/ViolationChecker.class b/bin/com/skku/se7/service/ViolationChecker.class
diff --git a/frontend/main.html b/frontend/main.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+    <meta charset="UTF-8">
+    <title>HTTP GET 요청 예제</title>
+</head>
+<body>
+    <h1>서버 응답:</h1>
+    <div id="response"></div>
+
+    <script>
+        // 서버에서 데이터를 가져오는 함수
+        function fetchData() {
+            fetch('http://ec2-3-35-3-126.ap-northeast-2.compute.amazonaws.com:8080/model/cpu')
+                .then(response => response.text())
+                .then(data => {
+                    // 응답을 HTML 요소에 표시
+                    document.getElementById('response').innerText = data;
+                })
+                .catch(error => {
+                    console.error('요청 중 오류 발생:', error);
+                });
+        }
+
+        // 페이지가 로드될 때 함수 실행
+        window.onload = fetchData;
+    </script>
+</body>
+</html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,3 +23,4 @@ public void addCorsMappings(CorsRegistry registry) {
		};
		}
		}