build: update docker image ci

bytecamp-galaxy · Feb 16, 2023 · ade4219 · ade4219
1 parent 00abfa5
commit ade4219
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -0,0 +1,29 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          tags: vgalaxy/mini-tiktok:latest
diff --git a/Dockerfile b/Dockerfile
@@ -32,7 +32,6 @@ WORKDIR /root
 COPY --from=build /root .
 COPY --from=script /root/wait.sh ./wait.sh
 COPY --from=script /root/configs ./configs
-COPY logs logs
 COPY scripts/wait.sh wait.sh
 RUN sed -i "s@http://\(deb\|security\).debian.org@https://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list \
     && apt update \

diff --git a/Makefile b/Makefile
@@ -19,11 +19,12 @@ test:
 	go test ./test/api_test.go ./test/common.go -v
 
 kill:
+	docker kill $$(docker ps -a -q)
 	# `$` will be escaped
 	ps -ef | grep -E "(go run ./cmd)|(/tmp/go-build)" | grep -v "grep" | awk '{print $$2}' | xargs kill -9
 
 service:
-	docker compose up mysql redis etcd otel-collector jaeger-all-in-one victoriametrics grafana minio
+	docker compose up -d mysql redis etcd otel-collector jaeger-all-in-one victoriametrics grafana minio
 
 docker: logs
 	docker compose up -d --scale user-server=${USER_SERVER} \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   api-server:
-    image: heiyan2020/mini-tiktok:latest
+    image: vgalaxy/mini-tiktok:latest
     network_mode: host
     volumes:
       - ./logs:/root/logs
@@ -12,7 +12,7 @@ services:
     command: bash /root/wait.sh 3306 2379 4317 9000 6379 -- /root/cmd/api/output/api
 
   user-server:
-    image: heiyan2020/mini-tiktok:latest
+    image: vgalaxy/mini-tiktok:latest
     network_mode: host
     volumes:
       - ./logs:/root/logs
@@ -22,7 +22,7 @@ services:
     command: bash /root/wait.sh 3306 2379 4317 9000 6379 -- /root/cmd/user/output/user
 
   comment-server:
-    image: heiyan2020/mini-tiktok:latest
+    image: vgalaxy/mini-tiktok:latest
     network_mode: host
     volumes:
       - ./logs:/root/logs
@@ -32,7 +32,7 @@ services:
     command: bash /root/wait.sh 3306 2379 4317 9000 6379 -- /root/cmd/comment/output/comment
 
   feed-server:
-    image: heiyan2020/mini-tiktok:latest
+    image: vgalaxy/mini-tiktok:latest
     network_mode: host
     volumes:
       - ./logs:/root/logs
@@ -42,7 +42,7 @@ services:
     command: bash /root/wait.sh 3306 2379 4317 9000 6379 -- /root/cmd/feed/output/feed
 
   publish-server:
-    image: heiyan2020/mini-tiktok:latest
+    image: vgalaxy/mini-tiktok:latest
     network_mode: host
     volumes:
       - ./logs:/root/logs
@@ -52,7 +52,7 @@ services:
     command: bash /root/wait.sh 3306 2379 4317 9000 6379 -- /root/cmd/publish/output/publish
 
   favorite-server:
-    image: heiyan2020/mini-tiktok:latest
+    image: vgalaxy/mini-tiktok:latest
     network_mode: host
     volumes:
       - ./logs:/root/logs
@@ -62,7 +62,7 @@ services:
     command: bash /root/wait.sh 3306 2379 4317 9000 6379 -- /root/cmd/favorite/output/favorite
 
   relation-server:
-    image: heiyan2020/mini-tiktok:latest
+    image: vgalaxy/mini-tiktok:latest
     network_mode: host
     volumes:
       - ./logs:/root/logs