deploy

m10-payments · Dec 18, 2023 · 69eadc0 · 69eadc0
1 parent f829f54
commit 69eadc0
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 38 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,4 +31,5 @@ jobs:
             make release
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_WRITE_PACKAGES }}
-          VERSION: ${{ steps.prepare.outputs.tag_name }}
+          VERSION: latest
+          TAG: latest
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -11,14 +11,14 @@ builds:
     env:
       - CGO_ENABLED=0
     goos:
-      - freebsd
-      - windows
+      #- freebsd
+      #- windows
       - darwin
       - linux
     goarch:
       - amd64
-      - arm64
-      - arm
+      #- arm64
+      #- arm
     goarm:
       - '7'
     ldflags:
@@ -119,7 +119,7 @@ snapshot:
 
 dockers:
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
+      - ghcr.io/m10-payments/{{ .ProjectName }}:{{ .Version }}-amd64
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
@@ -140,39 +140,39 @@ dockers:
     build_flag_templates:
       - --platform=linux/amd64
 
-  - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
-    dockerfile: Dockerfile.release
-    use: buildx
-    goos: linux
-    goarch: arm64
-    ids: *docker-ids
-    build_flag_templates:
-      - --platform=linux/arm64/v8
-
-  - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
-    dockerfile: Dockerfile.release
-    use: buildx
-    goos: linux
-    goarch: arm
-    goarm: '7'
-    ids: *docker-ids
-    build_flag_templates:
-      - --platform=linux/arm/v7
+  #- image_templates:
+  #    - ghcr.io/m10-payments/{{ .ProjectName }}:{{ .Version }}-arm64
+  #  dockerfile: Dockerfile.release
+  #  use: buildx
+  #  goos: linux
+  #  goarch: arm64
+  #  ids: *docker-ids
+  #  build_flag_templates:
+  #    - --platform=linux/arm64/v8
+
+  #- image_templates:
+  #    - ghcr.io/m10-payments/{{ .ProjectName }}:{{ .Version }}-armv7
+  #  dockerfile: Dockerfile.release
+  #  use: buildx
+  #  goos: linux
+  #  goarch: arm
+  #  goarm: '7'
+  #  ids: *docker-ids
+  #  build_flag_templates:
+  #    - --platform=linux/arm/v7
 
 docker_manifests:
-  - name_template: dkron/{{ .ProjectName }}:{{ .Version }}
+  - name_template: ghcr.io/m10-payments/{{ .ProjectName }}:{{ .Version }}
     image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
-      - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
-      - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
+      - ghcr.io/m10-payments/{{ .ProjectName }}:{{ .Version }}-amd64
+      #- dkron/{{ .ProjectName }}:{{ .Version }}-arm64
+      #- dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
-  - name_template: dkron/{{ .ProjectName }}:latest
+  - name_template: ghcr.io/m10-payments/{{ .ProjectName }}:latest
     image_templates:
-    - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
+    - ghcr.io/m10-payments/{{ .ProjectName }}:{{ .Version }}-amd64
+    #- dkron/{{ .ProjectName }}:{{ .Version }}-arm64
+    #- dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
 changelog:
   sort: asc

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ fury: $(LINUX_PKGS)
 $(LINUX_PKGS):
 	fury push --as distribworks $@
 
-PACKAGE_NAME          := github.com/distribworks/dkron
+PACKAGE_NAME          := ghcr.io/m10-payments/dkron
 GOLANG_CROSS_VERSION  ?= v1.21.5
 
 .PHONY: release-dry-run
@@ -15,6 +15,7 @@ release-dry-run:
 		-v ${PWD}:/dkron \
 		-w /dkron \
 		-e GITHUB_TOKEN \
+		-e VERSION=${VERSION} \
 		-e DOCKER_USERNAME \
 		-e DOCKER_PASSWORD \
 		-e DOCKER_REGISTRY \
@@ -32,14 +33,14 @@ release:
 		-v ${PWD}:/dkron \
 		-w /dkron \
 		-e GITHUB_TOKEN \
+		-e VERSION=${VERSION} \
 		-e DOCKER_USERNAME \
 		-e DOCKER_PASSWORD \
 		-e DOCKER_REGISTRY \
+		-e GORELEASER_CURRENT_TAG=v3.2.7-M1 \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v `pwd`:/go/src/$(PACKAGE_NAME) \
-		-w /go/src/$(PACKAGE_NAME) \
 		goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
-		--rm-dist --skip-validate --timeout=1h
+		release --rm-dist --skip-validate --timeout=1h
 
 .PHONY: clean
 clean: