diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b82808a5..92811808 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v6 with: distribution: goreleaser version: latest diff --git a/goreleaser.yaml b/.goreleaser.yaml similarity index 75% rename from goreleaser.yaml rename to .goreleaser.yaml index f66171b0..27227e14 100644 --- a/goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,12 +1,12 @@ # vim: set ts=2 sw=2 tw=0 fo=cnqoj -version: 1 +version: 2 project_name: "transfer" -#before: -# hooks: -# - go mod tidy -# - go generate ./... +before: + hooks: + - go mod tidy + - go generate ./... builds: - env: @@ -16,18 +16,15 @@ builds: goarch: - amd64 - arm64 - goarm: - - 8 main: ./cmd/trcli binary: trcli archives: - - format: tar.gz + - formats: ["tar.gz"] name_template: >- {{ .ProjectName }}_ {{- .Os }}_ {{- .Arch }} - {{- if .Arm }}v{{ .Arm }}{{ end }} changelog: sort: asc @@ -46,18 +43,22 @@ release: dockers: - image_templates: - "ghcr.io/doublecloud/transfer:{{.Version}}-amd64" + goos: linux + goarch: amd64 use: buildx dockerfile: Dockerfile build_flag_templates: - "--platform=linux/amd64" - image_templates: - - "ghcr.io/doublecloud/transfer:{{.Version}}-arm64v8" + - "ghcr.io/doublecloud/transfer:{{.Version}}-arm64" + goos: linux + goarch: arm64 use: buildx dockerfile: Dockerfile build_flag_templates: - - "--platform=linux/arm64/v8" + - "--platform=linux/arm64" docker_manifests: - name_template: "ghcr.io/doublecloud/transfer:{{.Version}}" image_templates: - "ghcr.io/doublecloud/transfer:{{.Version}}-amd64" - - "ghcr.io/doublecloud/transfer:{{.Version}}-arm64v8" + - "ghcr.io/doublecloud/transfer:{{.Version}}-arm64" diff --git a/Dockerfile b/Dockerfile index 0bad03db..286ad3fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ VOLUME /var/lib/docker # Create a non-root user and group RUN addgroup --system trcligroup && adduser --system --ingroup trcligroup trcliuser -# Copy the Go binary from Stage 1 (builder) +# Copy the Go binary COPY trcli /usr/local/bin/trcli RUN chmod +x /usr/local/bin/trcli