Merge branch 'master' of https://gerrit.lilingkun.com/G12Project
Change-Id: I72535eda24bb4ee2990694006f5e2dc306e31248
diff --git a/G12Project b/G12Project
new file mode 160000
index 0000000..af6e08a
--- /dev/null
+++ b/G12Project
@@ -0,0 +1 @@
+Subproject commit af6e08a2d39246df8c2e77c997e666a833794131
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index f10b96e..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: '3.8'
-
-services:
- backend:
- build:
- context: ./G12Project
- dockerfile: Dockerfile
- target: final
- container_name: g12-backend
- ports:
- - "8080:8080"
- environment:
- - SPRING_DATASOURCE_URL=jdbc:mysql://202.205.102.121:3306/g12develop
- - SPRING_DATASOURCE_USERNAME=team12
- - SPRING_DATASOURCE_PASSWORD=123456abc
- restart: unless-stopped
- networks:
- - g12-network
-
- frontend:
- build:
- context: ./G12-Frontend
- dockerfile: Dockerfile
- container_name: g12-frontend
- ports:
- - "80:80"
- depends_on:
- - backend
- restart: unless-stopped
- networks:
- - g12-network
-
-networks:
- g12-network:
- driver: bridge
\ No newline at end of file