Skip to content

Commit

Permalink
Merge pull request #510 from CSUSTers/dev
Browse files Browse the repository at this point in the history
impr: get sticker pack
  • Loading branch information
hugefiver authored Dec 27, 2024
2 parents 0e6b4c2 + 9e364b0 commit fce131c
Show file tree
Hide file tree
Showing 8 changed files with 256 additions and 53 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
steps:

- name: Get source
uses: actions/checkout@v3
uses: actions/checkout@v3

- name: Build Image
id: build-image
uses: redhat-actions/buildah-build@v2
with:
image: csust/csust-got-hoo
image: csusters/csust-got
tags: |
latest-${{ github.ref_name }}
containerfiles: |
Expand All @@ -42,9 +42,9 @@ jobs:
with:
image: ${{ steps.build-image.outputs.image }}
tags: ${{ steps.build-image.outputs.tags }}
registry: ${{ secrets.HARBOR_URL }}
username: ${{ secrets.HARBOR_USERNAME }}
password: ${{ secrets.HARBOR_PASSWD }}
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
retry: 1000

- name: Restart Kubernetes Deployment
Expand Down
1 change: 1 addition & 0 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ linters-settings:
- github.com/gabriel-vasile/mimetype
- github.com/u2takey/ffmpeg-go
- github.com/samber/lo
- github.com/cespare/xxhash/v2
# Packages that are not allowed where the value is a suggestion.
deny:
# - pkg: "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN make deploy
FROM --platform=$BUILDPLATFORM alpine

RUN apk add --no-cache tzdata
COPY --from=hugefiver/ffmpeg:7.1 /ffmpeg /usr/local/bin/ffmpeg
COPY --from=ghcr.io/hugefiver/static-ffmpeg:latest /ffmpeg /usr/local/bin/ffmpeg
# COPY --from=hugefiver/ffmpeg:7.0.1 /ffprobe /usr/local/bin/ffprobe

WORKDIR /app
Expand Down
Loading

0 comments on commit fce131c

Please sign in to comment.