diff --git a/.github/workflows/docker-analyze.yaml b/.github/workflows/docker-analyze.yaml deleted file mode 100644 index a3533a7..0000000 --- a/.github/workflows/docker-analyze.yaml +++ /dev/null @@ -1,50 +0,0 @@ -name: Docker-Analyze - -on: - schedule: - - cron: "0 0 * * *" # Daily at midnight UTC - workflow_dispatch: - inputs: - trigger-build: - description: 'Trigger a manual build and push' - default: 'true' - -env: - DOCKER_IMAGE: donaldzou/wgdashboard - -jobs: - docker_analyze: - runs-on: ubuntu-latest - strategy: - fail-fast: false - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_PASSWORD }} - - - name: Install Docker Scout - run: | - echo "Installing Docker Scout..." - curl -fsSL https://raw.githubusercontent.com/docker/scout-cli/main/install.sh | sh -s -- - echo "Docker Scout installed successfully." - - name: Analyze Docker image with Docker Scout - id: analyze-image - run: | - echo "Analyzing Docker image with Docker Scout..." - docker scout cves ${{ env.DOCKER_IMAGE }}:latest > scout-results.txt - cat scout-results.txt - echo "Docker Scout analysis completed." - - name: Fail if critical CVEs are found - run: | - if grep -q "0C" scout-results.txt; then - echo "No critical vulnerabilities found! Continueing." - exit 0 - else - echo "At least one critical vulnerabilities found! Exiting." - exit 1 - fi diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-related.yaml similarity index 72% rename from .github/workflows/docker-build.yaml rename to .github/workflows/docker-related.yaml index f038314..a2ae195 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-related.yaml @@ -1,8 +1,10 @@ -name: Docker-Build +name: Docker Scan and Build on: push: branches: [ main ] + schedule: + - cron: "0 0 * * *" # Daily at midnight UTC workflow_dispatch: inputs: trigger-build: @@ -13,7 +15,7 @@ env: DOCKER_IMAGE: donaldzou/wgdashboard jobs: - docker_build: + docker_build_analyze: runs-on: ubuntu-latest strategy: fail-fast: false @@ -21,17 +23,17 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 - - name: Log in to Docker Hub uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + with: + platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -42,3 +44,12 @@ jobs: push: true tags: ${{ env.DOCKER_IMAGE }}:latest platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 + + - name: Docker Scout + id: docker-scout + uses: docker/scout-action@v1 + with: + command: cves + image: ${{ env.DOCKER_IMAGE }}:latest + only-severities: critical,high,medium,low,unspecified + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml index a8c004a..7bdf543 100644 --- a/.github/workflows/qodana_code_quality.yml +++ b/.github/workflows/qodana_code_quality.yml @@ -3,8 +3,8 @@ on: workflow_dispatch: pull_request: push: - branches: - - main + branches: # Specify your branches here + - main # The 'main' branch - v4.2-dev jobs: @@ -17,10 +17,12 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: ${{ github.event.pull_request.head.sha }} - fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit + fetch-depth: 0 # a full history is required for pull request analysis - name: 'Qodana Scan' uses: JetBrains/qodana-action@v2024.3 + with: + pr-mode: false env: QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_2090978292 }} QODANA_ENDPOINT: 'https://qodana.cloud' diff --git a/README.md b/README.md index 537bcfc..1604177 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ +> [!TIP] +> 🎉 I'm excited to announce that WGDashboard is officially listed on DigitalOcean's Marketplace! For more information, please visit [Host WGDashboard & WireGuard with DigitalOcean](https://donaldzou.dev/WGDashboard-Documentation/host-wgdashboard-wireguard-with-digitalocean.html) for more information! + > [!NOTE] > **Help Wanted 🎉**: Localizing WGDashboard to other languages! If you're willing to help, please visit https://github.com/donaldzou/WGDashboard/issues/397. Many thanks! + +
@@ -14,10 +19,18 @@
This project is supported by
+
+
+
+
Monitoring WireGuard is not convenient, in most case, you'll need to login to your server and type wg show
. That's why this project is being created, to view and manage all WireGuard configurations in a easy way.
With all these awesome features, while keeping it easy to install and use
@@ -30,7 +43,13 @@ + ++ Alternatively, you can also reach out at our Matrix.org Chatroom :) +
+