x86_64 file

port-labs · Jan 2, 2024 · 5608681 · 5608681
1 parent d0e0dfe
commit 5608681
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -23,24 +23,24 @@ builds:
   goarch:
   - arm64
 dockers:
-#- image_templates:
-#  - "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:{{ .Version }}-amd64"
-#  use: buildx
-#  dockerfile: Dockerfile
-#  goarch: amd64
-#  build_flag_templates:
-#  - "--label=org.opencontainers.image.created={{.Date}}"
-#  - "--label=org.opencontainers.image.title={{.ProjectName}}"
-#  - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-#  - "--label=org.opencontainers.image.version={{.Version}}"
-#  - "--platform=linux/amd64"
-#  extra_files:
-#    - assets/
+- image_templates:
+  - "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:{{ .Version }}-amd64"
+  use: buildx
+  dockerfile: Dockerfile_x86_64
+  goarch: amd64
+  build_flag_templates:
+  - "--label=org.opencontainers.image.created={{.Date}}"
+  - "--label=org.opencontainers.image.title={{.ProjectName}}"
+  - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+  - "--label=org.opencontainers.image.version={{.Version}}"
+  - "--platform=linux/amd64"
+  extra_files:
+    - assets/
 - image_templates:
   - "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:{{ .Version }}-arm64v8"
   use: buildx
   goarch: arm64
-  dockerfile: Dockerfile_x86_64
+  dockerfile: Dockerfile
   build_flag_templates:
   - "--label=org.opencontainers.image.created={{.Date}}"
   - "--label=org.opencontainers.image.title={{.ProjectName}}"
@@ -52,7 +52,7 @@ dockers:
 docker_manifests:
 - name_template: "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:{{ .Version }}"
   image_templates:
-#  - "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:{{ .Version }}-amd64"
+  - "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:{{ .Version }}-amd64"
   - "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:{{ .Version }}-arm64v8"
 #- name_template: "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:latest"
 #  image_templates:

diff --git a/Dockerfile_x86_64 b/Dockerfile_x86_64
@@ -3,8 +3,7 @@ FROM alpine
 COPY assets/ /assets
 
 #USER nonroot:nonroot
-RUN echo "aaa"
-RUN if apk --print-arch | grep -q x86_64; then apk add gcompat; fi
+RUN apk add gcompat
 
 ENTRYPOINT ["/usr/bin/port-k8s-exporter"]