diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 6393a57..3112ee0 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -35,6 +35,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.yml b/goreleaser.yml index 550f7d0..91c0a1e 100644 --- a/goreleaser.yml +++ b/goreleaser.yml @@ -76,6 +76,8 @@ dockers: - image_templates: - "ghcr.io/method-security/gitlabctl:{{ .Version }}-amd64" - "ghcr.io/method-security/gitlabctl:latest-amd64" + - "docker.io/methodsecurity/gitlabctl:{{ .Version }}-amd64" + - "docker.io/methodsecurity/gitlabctl:latest-amd64" use: buildx goos: linux goarch: amd64 @@ -95,6 +97,8 @@ dockers: - image_templates: - "ghcr.io/method-security/gitlabctl:{{ .Version }}-arm64" - "ghcr.io/method-security/gitlabctl:latest-arm64" + - "docker.io/methodsecurity/gitlabctl:{{ .Version }}-arm64" + - "docker.io/methodsecurity/gitlabctl:latest-arm64" use: buildx goos: linux goarch: arm64 @@ -117,6 +121,19 @@ docker_manifests: image_templates: - 'ghcr.io/method-security/gitlabctl:{{ .Version }}-amd64' - 'ghcr.io/method-security/gitlabctl:{{ .Version }}-arm64' + - name_template: 'ghcr.io/method-security/gitlabctl:latest' + image_templates: + - 'ghcr.io/method-security/gitlabctl:{{ .Version }}-amd64' + - 'ghcr.io/method-security/gitlabctl:{{ .Version }}-arm64' + - name_template: 'methodsecurity/gitlabctl:{{ .Version }}' + image_templates: + - 'docker.io/methodsecurity/gitlabctl:{{ .Version }}-amd64' + - 'docker.io/methodsecurity/gitlabctl:{{ .Version }}-amd64' + - name_template: 'methodsecurity/gitlabctl:latest' + image_templates: + - 'docker.io/methodsecurity/gitlabctl:{{ .Version }}-amd64' + - 'docker.io/methodsecurity/gitlabctl:{{ .Version }}-amd64' + source: enabled: true