Skip to content

Commit

Permalink
💚 wrong CI file
Browse files Browse the repository at this point in the history
  • Loading branch information
soxft committed Aug 16, 2024
1 parent e0b8203 commit 20e4b14
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 10 deletions.
33 changes: 25 additions & 8 deletions .github/workflows/docker-push-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
ghcr.io/soxft/busuanzi:${{ github.ref_name }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ COPY --from=builder /app/entrypoint.sh /app
RUN chmod +x /app/entrypoint.sh

EXPOSE 8080
ENTRYPOINT [ "./entrypoint.sh" ]
ENTRYPOINT [ "sh", "entrypoint.sh" ]
3 changes: 2 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
version: "3"
version: "3.8"

services:
redis:
image: "redis:alpine"
Expand Down

0 comments on commit 20e4b14

Please sign in to comment.