From 20e4b14584bcf1fb2d15c61ec52d8b553f655737 Mon Sep 17 00:00:00 2001
From: soxft <email@xcsoft.top>
Date: Fri, 16 Aug 2024 19:00:44 +0800
Subject: [PATCH] :green_heart:  wrong CI file

---
 .github/workflows/docker-push-rc.yml | 33 +++++++++++++++++++++-------
 Dockerfile                           |  2 +-
 docker-compose.yaml                  |  3 ++-
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-push-rc.yml b/.github/workflows/docker-push-rc.yml
index 2b6d743..8679109 100644
--- a/.github/workflows/docker-push-rc.yml
+++ b/.github/workflows/docker-push-rc.yml
@@ -19,25 +19,42 @@ jobs:
         with:
           username: xcsoft
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+      -
+        name: Set up Docker Build Context
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: |
+            xcsoft/busuanzi:${{ github.ref_name }}
 
-      - name: Login to Github docker
+  github-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      -
-        name: Set up Docker Build Context
+      - name: Set up Docker Build Context
+
         uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
+
+      - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile
           push: true
           tags: |
-            xcsoft/busuanzi:${{ github.ref_name }}
-            ghcr.io/xcsoft/busuanzi:${{ github.ref_name }}
\ No newline at end of file
+            ghcr.io/soxft/busuanzi:${{ github.ref_name }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 253fca5..bd570aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,4 +31,4 @@ COPY --from=builder /app/entrypoint.sh /app
 RUN chmod +x /app/entrypoint.sh
 
 EXPOSE 8080
-ENTRYPOINT  [ "./entrypoint.sh" ]
\ No newline at end of file
+ENTRYPOINT  [ "sh", "entrypoint.sh" ]
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8843952..51b4df2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,4 +1,5 @@
-version: "3"
+version: "3.8"
+
 services:
   redis:
     image: "redis:alpine"