diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index a583406..c64626b 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -36,6 +36,12 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Login to docker.io registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Checkout code uses: actions/checkout@v4.1.6 with: @@ -77,7 +83,7 @@ jobs: - name: Install Dependencies run: | brew update - brew install libpcap + brew install libpcap docker echo "LD_LIBRARY_PATH=$(brew --prefix)/Cellar/libpcap/*/lib" >> $GITHUB_ENV if: matrix.os == 'macos-latest' @@ -98,6 +104,12 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} if: matrix.os != 'macos-latest' + - name: Login to docker.io registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Checkout code uses: actions/checkout@v4.1.6 with: @@ -161,6 +173,12 @@ jobs: - name: Install Syft uses: anchore/sbom-action/download-syft@v0.16.0 + - name: Login to docker.io registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to ghcr.io registry uses: docker/login-action@v3 with: diff --git a/.goreleaser/goreleaser-publish.yml b/.goreleaser/goreleaser-publish.yml index db59ae0..d1ac808 100644 --- a/.goreleaser/goreleaser-publish.yml +++ b/.goreleaser/goreleaser-publish.yml @@ -50,6 +50,8 @@ dockers: - image_templates: - "ghcr.io/method-security/codeanalyze:{{ .Version }}-amd64" - "ghcr.io/method-security/codeanalyze:latest-amd64" + - "docker.io/methodsecurity/codeanalyze:{{ .Version }}-amd64" + - "docker.io/methodsecurity/codeanalyze:latest-amd64" use: buildx goos: linux goarch: amd64 @@ -71,6 +73,8 @@ dockers: - image_templates: - "ghcr.io/method-security/codeanalyze:{{ .Version }}-arm64" - "ghcr.io/method-security/codeanalyze:latest-arm64" + - "docker.io/methodsecurity/codeanalyze:{{ .Version }}-arm64" + - "docker.io/methodsecurity/codeanalyze:latest-arm64" use: buildx goos: linux goarch: arm64 @@ -95,6 +99,18 @@ docker_manifests: image_templates: - 'ghcr.io/method-security/codeanalyze:{{ .Version }}-amd64' - 'ghcr.io/method-security/codeanalyze:{{ .Version }}-arm64' + - name_template: 'ghcr.io/method-security/codeanalyze:latest' + image_templates: + - 'ghcr.io/method-security/codeanalyze:{{ .Version }}-amd64' + - 'ghcr.io/method-security/codeanalyze:{{ .Version }}-arm64' + - name_template: 'methodsecurity/codeanalyze:{{ .Version }}' + image_templates: + - 'docker.io/methodsecurity/codeanalyze:{{ .Version }}-amd64' + - 'docker.io/methodsecurity/codeanalyze:{{ .Version }}-arm64' + - name_template: 'methodsecurity/codeanalyze:latest' + image_templates: + - 'docker.io/methodsecurity/codeanalyze:{{ .Version }}-amd64' + - 'docker.io/methodsecurity/codeanalyze:{{ .Version }}-arm64' sboms: - artifacts: archive