diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 1a32e19..ce728bf 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -22,8 +22,14 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: - username: wh1isper + username: ${{ vars.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: b-scheduler + password: ${{ secrets.PAT }} - name: Build and push release id: docker_build_release_matrix uses: docker/build-push-action@v5 @@ -34,4 +40,6 @@ jobs: cache-to: type=gha,mode=max file: ./docker/Dockerfile push: true - tags: wh1isper/brq:dev + tags: | + ${{ vars.DOCKERHUB_USERNAME }}/brq:dev + ghcr.io/b-scheduler/brq:dev diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index a73690a..bfc4712 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -33,8 +33,14 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: - username: wh1isper + username: ${{ vars.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: b-scheduler + password: ${{ secrets.PAT }} - name: Build and push image id: docker_build_publish uses: docker/build-push-action@v5 @@ -45,7 +51,9 @@ jobs: cache-to: type=gha,mode=max file: ./docker/Dockerfile push: true - tags: wh1isper/brq:${{ github.ref_name }} + tags: | + ${{ vars.DOCKERHUB_USERNAME }}/brq:${{ github.ref_name }} + ghcr.io/b-scheduler/brq:${{ github.ref_name }} - name: Build and push image id: docker_build_publish_matrix_latest uses: docker/build-push-action@v5 @@ -56,4 +64,6 @@ jobs: cache-to: type=gha,mode=max file: ./docker/Dockerfile push: true - tags: wh1isper/brq:latest + tags: | + ${{ vars.DOCKERHUB_USERNAME }}/brq:latest + ghcr.io/b-scheduler/brq:latest diff --git a/docker/Dockerfile b/docker/Dockerfile index 88be990..beef87b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,3 +10,5 @@ FROM python:3.11.10-slim-bookworm COPY --from=builder /source/dist/*.whl /tmp/ RUN pip install --no-cache-dir $(echo /tmp/*.whl)[browser] + +LABEL org.opencontainers.image.source=https://github.com/b-scheduler/bscheduler