diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml index 3ab778b..c7346db 100644 --- a/.gitea/workflows/server.yaml +++ b/.gitea/workflows/server.yaml @@ -20,7 +20,7 @@ jobs: sonarqube: needs: build-server runs-on: ubuntu-latest - if: gitea.ref == 'refs/heads/master' + if: github.ref_name == 'master' steps: - uses: actions/checkout@v3 - name: Setup dotnet @@ -96,19 +96,21 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - registry: forge.rainote.dev + registry: ${{ github.server_url }} username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_TOKEN }} - name: Build and push uses: docker/build-push-action@v5 with: context: . + file: Server/Dockerfile push: true - tags: wonderking/continuity:latest,"wonderking/continuity:${{ github.ref_name }}" - platforms: linux/amd64,linux/arm64,linux/arm/v7 + tags: forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }} + platforms: linux/amd64 dependency-track-container: needs: build-push-server-container runs-on: ubuntu-latest + container: catthehacker/ubuntu:act-latest steps: - uses: actions/checkout@v3 - name: Setup dotnet @@ -123,9 +125,15 @@ jobs: run: | mkdir ~/.docker curl -sSfL https://raw.githubusercontent.com/docker/sbom-cli-plugin/main/install.sh | sh -s -- + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + registry: ${{ github.server_url }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_TOKEN }} - name: Generate SBOM run: | - docker sbom --format cyclonedx-json --output bom.json forge.rainote.dev/Wonderking/Continuity:latest + docker sbom forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }} --format cyclonedx-json --output bom.json - name: Upload SBOM uses: https://github.com/DependencyTrack/gh-upload-sbom@v2.0.1 with: diff --git a/Server/docker-compose.yml b/Server/docker-compose.yml index 5cbd3e9..0bc41ef 100644 --- a/Server/docker-compose.yml +++ b/Server/docker-compose.yml @@ -1,6 +1,6 @@ services: server: - image: continuity-server:latest + image: server:latest environment: - ENVIRONMENT=Development - Testing:CreateAccountOnLogin=true