Merge pull request #4 from RyoJerryYu/fix-build-error

fix: build docker error
RyoJerryYu · Jun 10, 2024 · c9d1412 · c9d1412
2 parents a6e88f4 + 99f010a
commit c9d1412
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,8 +9,7 @@ COPY requirements.txt /app/
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY main.py /app/
-COPY proto/gen /app/proto/gen
-COPY src /app/src
+COPY memos_webhook /app/memos_webhook
 
 # Make port 8000 available to the environment outside this container
 EXPOSE 8000

diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ update_deps:
 	@./proto/update_deps.sh
 
 run:
-	@./run.sh
+	@./tests/run.sh
 
 freeze:
 	@pip freeze > requirements.txt

diff --git a/run.sh b/run.sh
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -0,0 +1 @@
+.download
diff --git a/docker_compose.yaml → tests/docker_compose.yaml b/docker_compose.yaml → tests/docker_compose.yaml
@@ -2,19 +2,16 @@ version: "3.0"
 services:
   memos:
     networks:
-      - memos
+      - memos_webhook_test
     image: neosmemo/memos:0.22.1
-    container_name: memos
     ports:
-      - 5230:5230
+      - 5240:5230
   webhook:
-    image: ghcr.io/ryojerryyu/memos-webhook-py:test
     networks:
-      - memos
+      - memos_webhook_test
     build:
-      context: .
+      context: ..
       dockerfile: Dockerfile
-    container_name: webhook
     environment:
       - LOG_LEVEL=debug
       - MEMOS_HOST=memos
@@ -24,4 +21,4 @@ services:
       - ./.download:/app/download
 
 networks:
-  memos:
+  memos_webhook_test:
diff --git a/tests/run.sh b/tests/run.sh
@@ -0,0 +1 @@
+docker-compose -f tests/docker_compose.yaml up -d
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		docker-compose -f tests/docker_compose.yaml up -d