Merge "添加bt与tracker交互"
diff --git a/Dockerfile b/Dockerfile
index 468c648..2d4db7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# 构建阶段
-FROM maven:3.9-eclipse-temurin-17 AS build
+FROM maven:3.9.6-amazoncorretto-17 AS build
# 设置工作目录
WORKDIR /build
@@ -17,19 +17,19 @@
RUN mvn clean package -DskipTests
# 运行阶段
-FROM eclipse-temurin:17-jdk AS final
+FROM amazoncorretto:17 AS final
# 设置工作目录
WORKDIR /team12
# 设置时区
ENV TZ=Asia/Shanghai
-RUN apt-get update && \
- apt-get install -y tzdata && \
+RUN yum update -y && \
+ yum install -y tzdata && \
ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \
echo $TZ > /etc/timezone && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists/*
+ yum clean all && \
+ rm -rf /var/cache/yum
# 从构建阶段复制构建好的 jar 文件
COPY --from=build /build/target/*.jar team12.jar
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..f10b96e
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,35 @@
+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