diff --git a/Dockerfile b/Dockerfile
index 109cbea6..3dcf8877 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ RUN apk update && apk add --no-cache ca-certificates && update-ca-certificates
 COPY --from=build-env /paopao-ce/paopao-ce /usr/bin/paopao-ce
 COPY --from=build-env /paopao-ce/assets/comic.ttf /assets/comic.ttf
 COPY --from=build-env /paopao-ce/configs /configs
+COPY config.yaml .
 
 EXPOSE 8000
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 00000000..fd3c261c
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,12 @@
+version: "3"
+services:
+  backend:
+    build:
+      context: .
+    expose:
+      - 3306
+      - 4080
+
+  frontend:
+    build:
+      context: web
diff --git a/web/Dockerfile b/web/Dockerfile
index 0f32757a..3a703661 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,9 +1,15 @@
-FROM library/nginx
+FROM node as node
 
-USER root
+WORKDIR /work/
 
+COPY . .
+
+RUN yarn
+RUN yarn build
+
+FROM nginx as nginx
 # copy static files
-COPY ./dist/ /usr/share/nginx/html/
+COPY --from=node /work/dist/ /usr/share/nginx/html/
 
 # HEALTHCHECK
-HEALTHCHECK --interval=5s --timeout=3s  --retries=3  CMD service nginx status | grep running || exit 1
\ No newline at end of file
+HEALTHCHECK --interval=5s --timeout=3s  --retries=3  CMD service nginx status | grep running || exit 1