Merge branch 'main' into dev

2 files · +6 -13

M .goreleaser.yaml +5 -5

@@ -1,3 +1,5 @@
	1	+	version: 2
	2	+
1	3		before:
2	4		hooks:
3	5		- go mod tidy

@@ -27,13 +29,12 @@ dockers:
27	29		build_flag_templates:
28	30		- "--pull"
29	31		- "--platform=linux/amd64"
	32	+	- "--build-arg=ARCH=amd64"
30	33		- "--label=org.opencontainers.image.created={{.Date}}"
31	34		- "--label=org.opencontainers.image.title={{.ProjectName}}"
32	35		- "--label=org.opencontainers.image.revision={{.FullCommit}}"
33	36		- "--label=org.opencontainers.image.version={{.Version}}"
34	37		- "--label=org.opencontainers.image.source=https://github.com/bnema/gordon"
35		-	extra_files:
36		-	- .iscontainer
37	38		- image_templates:
38	39		- "ghcr.io/bnema/gordon:{{ .Tag }}-arm64"
39	40		use: buildx

@@ -42,13 +43,12 @@ dockers:
42	43		build_flag_templates:
43	44		- "--pull"
44	45		- "--platform=linux/arm64"
	46	+	- "--build-arg=ARCH=arm64"
45	47		- "--label=org.opencontainers.image.created={{.Date}}"
46	48		- "--label=org.opencontainers.image.title={{.ProjectName}}"
47	49		- "--label=org.opencontainers.image.revision={{.FullCommit}}"
48	50		- "--label=org.opencontainers.image.version={{.Version}}"
49	51		- "--label=org.opencontainers.image.source=https://github.com/bnema/gordon"
50		-	extra_files:
51		-	- .iscontainer
52	52
53	53		archives:
54	54		- format: zip

@@ -59,4 +59,4 @@ changelog:
59	59		filters:
60	60		exclude:
61	61		- "^docs:"
62		-	- "^test:"⏎̸
	62	+	- "^test:"

+version: 2
 before:
   hooks:
     - go mod tidy
     build_flag_templates:
       - "--pull"
       - "--platform=linux/amd64"
+      - "--build-arg=ARCH=amd64"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Version}}"
       - "--label=org.opencontainers.image.source=https://github.com/bnema/gordon"
-    extra_files:
-      - .iscontainer
   - image_templates:
       - "ghcr.io/bnema/gordon:{{ .Tag }}-arm64"
     use: buildx
     build_flag_templates:
       - "--pull"
       - "--platform=linux/arm64"
+      - "--build-arg=ARCH=arm64"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Version}}"
       - "--label=org.opencontainers.image.source=https://github.com/bnema/gordon"
-    extra_files:
-      - .iscontainer
 archives:
   - format: zip
   filters:
     exclude:
       - "^docs:"
-      - "^test:"⏎̸
+      - "^test:"

M Dockerfile +1 -8

@@ -1,15 +1,8 @@
1		-	# Start from scratch
2	1		FROM alpine:latest
3	2
4		-	ARG ARCH
	3	+	COPY gordon /gordon
5	4
6		-	# Copy the pre-built binary for the specific architecture
7		-	COPY dist/gordon-linux-${ARCH} /gordon
8		-	# Create the .iscontainer file
9	5		RUN touch /.iscontainer
10	6
11		-	# Set the entrypoint
12	7		ENTRYPOINT ["/gordon"]
13		-
14		-	# Default command
15	8		CMD ["serve"]

-# Start from scratch
 FROM alpine:latest
-ARG ARCH
+COPY gordon /gordon
-# Copy the pre-built binary for the specific architecture
-COPY dist/gordon-linux-${ARCH} /gordon
-# Create the .iscontainer file
 RUN touch /.iscontainer
-# Set the entrypoint
 ENTRYPOINT ["/gordon"]
-# Default command
 CMD ["serve"]