chore: cleanups for goreleaser, and again

persona-id · Dec 6, 2023 · a919774 · a919774
1 parent f3791d4
commit a919774
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 55 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -19,7 +19,9 @@ archives:
   - builds_info:
       group: root
       owner: root
-    wrap_in_directory: true
+    files:
+      - src: configs/config.yaml
+        strip_parent: true
     format: tar.gz
     # this name template makes the OS and Arch compatible with the results of uname.
     name_template: >-
@@ -29,16 +31,13 @@ archives:
       {{- else if eq .Arch "386" }}i386
       {{- else }}{{ .Arch }}{{ end }}
       {{- if .Arm }}v{{ .Arm }}{{ end }}
-    files:
-      - src: configs/example_config.yaml
-        dst: configs/config.yaml
-        strip_parent: true
+    wrap_in_directory: true
 
-dockers:
-  - dockerfile: build/Dockerfile
-  - image_templates:
-      - "ghcr.io/kuzmik/{{.ProjectName}}:{{ .Tag }}"
-      - "ghcr.io/kuzmik/{{.ProjectName}}:latest"
+# dockers:
+#   - dockerfile: build/Dockerfile
+#   - image_templates:
+#       - "ghcr.io/kuzmik/{{.ProjectName}}:{{ .Tag }}"
+#       - "ghcr.io/kuzmik/{{.ProjectName}}:latest"
 
 checksum:
   name_template: 'checksums.txt'
@@ -51,4 +50,3 @@ changelog:
   filters:
     exclude:
       - '^docs:'
-      - '^test:'
diff --git a/Makefile b/Makefile
@@ -42,3 +42,9 @@ run: build
 
 docker: clean lint
 	@docker build --build-arg="VERSION=${VERSION}" --build-arg="BUILD_TIME=${BUILD_TIME}" --build-arg="BUILD_SHA=${BUILD_SHA}" -f build/dev.Dockerfile . -t proxysql-agent
+
+snapshot: clean lint
+	@goreleaser --snapshot --clean
+
+release: clean lint
+	@goreleaser --clean
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -9,7 +9,7 @@ RUN apk update \
 WORKDIR /app
 
 COPY --chown=agent:agent --from=builder --chmod=700 /build/proxysql-agent /app/
-COPY --chown=agent:agent --from=builder --chmod=600 /build/configs/example_config.yaml /app/config.yaml
+COPY --chown=agent:agent --from=builder --chmod=600 /build/configs/config.yaml /app/config.yaml
 
 USER agent
 

diff --git a/build/dev.Dockerfile b/build/dev.Dockerfile
@@ -37,7 +37,7 @@ RUN apk update \
 WORKDIR /app
 
 COPY --chown=agent:agent --from=builder --chmod=700 /build/proxysql-agent /app/
-COPY --chown=agent:agent --from=builder --chmod=600 /build/configs/example_config.yaml /app/config.yaml
+COPY --chown=agent:agent --from=builder --chmod=600 /build/configs/config.yaml /app/config.yaml
 
 USER agent
 

diff --git a/configs/example_config.yaml → configs/config.yaml b/configs/example_config.yaml → configs/config.yaml