fix: dockerhub address (#250)

Signed-off-by: sh1luo <690898835@qq.com>

.github/workflows/build.yml

@@ -1,16 +1,10 @@
 name: Build
 
-on:
+on: [push, pull_request]
-  push:
-    branches:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
 
 jobs:
   frontend:
-    name: Front-end build
+    name: Front-end
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -21,7 +15,7 @@ jobs:
         working-directory: ./web
 
   backend:
-    name: Back-end build
+    name: Back-end
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -29,17 +23,44 @@ jobs:
         with:
           go-version: '^1.16.5'
       - run: go version
-
       - name: Build
         run: |
           go build -race -ldflags "-extldflags '-static'"
         working-directory: ./
 
-  docker:
+  release:
-    name: Docker compose
+    name: Release
     runs-on: ubuntu-latest
+    needs: [ frontend, backend ]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Start containers
+        with:
-        run: docker-compose up
+          fetch-depth: 0
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12
+      - name: Release
+        run: yarn global add semantic-release@17.4.4 && semantic-release
+        env:
+          GH_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
+
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+    if: github.repository == 'casbin/casdoor' && github.event_name == 'push'
+    needs: release
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: casbin/casdoor:latest

.github/workflows/release.yml

@@ -1,67 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  frontend:
-    name: Front-end build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14.17.0'
-      - run: yarn install && CI=false yarn run build
-        working-directory: ./web
-
-  backend:
-    name: Back-end build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '^1.16.5'
-
-      - name: Build
-        run: |
-          go build -race -ldflags "-extldflags '-static'"
-        working-directory: ./
-
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    needs: [frontend, backend]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: 12
-      - name: Release
-        run: yarn global add semantic-release@17.4.4 && semantic-release
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-  publish:
-    name: Publish
-    runs-on: ubuntu-latest
-    needs: release
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      - name: Push to Docker Hub
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: shiluo/casdoor:latest

Dockerfile

@@ -16,4 +16,4 @@ COPY --from=BACK /go/src/casdoor/ ./
 COPY --from=BACK /usr/bin/wait-for-it ./
 RUN mkdir -p web/build && apk add --no-cache bash coreutils
 COPY --from=FRONT /web/build /web/build
-ENTRYPOINT ["./wait-for-it", "db:3306 ", "--", "./server"]
+CMD ./wait-for-it db:3306 -- ./server

docker-compose.yml

@@ -8,7 +8,6 @@ services:
       - "8000:8000"
     depends_on:
       - db
-    command: ["./wait-for-it db:3306 -- ./server"]
     volumes:
       - ./conf:/conf/
   db: