update the names to be more specific and consistent

launchdarkly · Jun 5, 2024 · b837ada · b837ada
1 parent 816b05d
commit b837ada
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 50 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -74,13 +74,13 @@ jobs:
           ignore-unfixed: true
       - uses: aquasecurity/trivy-action@master
         with:
-          image-ref: launchdarkly/ld-relay:${{ steps.image-tag.outputs.value }}-static-debian12-amd64
+          image-ref: launchdarkly/ld-relay:${{ steps.image-tag.outputs.value }}-nonroot-static-debian12-amd64
           format: 'table'
           exit-code: '1'
           ignore-unfixed: true
       - uses: aquasecurity/trivy-action@master
         with:
-          image-ref: launchdarkly/ld-relay:${{ steps.image-tag.outputs.value }}-debug-static-debian12-amd64
+          image-ref: launchdarkly/ld-relay:${{ steps.image-tag.outputs.value }}-debug-nonroot-static-debian12-amd64
           format: 'table'
           exit-code: '1'
           ignore-unfixed: true
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -125,42 +125,42 @@ dockers:
 
   # AMD64
   - image_templates:
-      - "launchdarkly/ld-relay:{{ .Version }}-static-debian12-amd64"
-      - "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-amd64"
-      - "launchdarkly/ld-relay:latest-static-debian12-amd64"
+      - "launchdarkly/ld-relay:{{ .Version }}-nonroot-static-debian12-amd64"
+      - "launchdarkly/ld-relay:v{{ .Major }}-nonroot-static-debian12-amd64"
+      - "launchdarkly/ld-relay:latest-nonroot-static-debian12-amd64"
     use: buildx
     goos: linux
     goarch: amd64
-    dockerfile: Dockerfile-static-debian12.goreleaser
+    dockerfile: Dockerfile-nonroot-static-debian12.goreleaser
     skip_push: false
     build_flag_templates:
       - "--pull"
       - "--platform=linux/amd64"
 
   # ARMv7
   - image_templates:
-      - "launchdarkly/ld-relay:{{ .Version }}-static-debian12-armv7"
-      - "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-armv7"
-      - "launchdarkly/ld-relay:latest-static-debian12-armv7"
+      - "launchdarkly/ld-relay:{{ .Version }}-nonroot-static-debian12-armv7"
+      - "launchdarkly/ld-relay:v{{ .Major }}-nonroot-static-debian12-armv7"
+      - "launchdarkly/ld-relay:latest-nonroot-static-debian12-armv7"
     use: buildx
     goos: linux
     goarch: arm
     goarm: 7
-    dockerfile: Dockerfile-static-debian12.goreleaser
+    dockerfile: Dockerfile-nonroot-static-debian12.goreleaser
     skip_push: false
     build_flag_templates:
       - "--pull"
       - "--platform=linux/arm/v7"
 
   # ARM64v8
   - image_templates:
-      - "launchdarkly/ld-relay:{{ .Version }}-static-debian12-arm64v8"
-      - "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-arm64v8"
-      - "launchdarkly/ld-relay:latest-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:{{ .Version }}-nonroot-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:v{{ .Major }}-nonroot-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:latest-nonroot-static-debian12-arm64v8"
     use: buildx
     goos: linux
     goarch: arm64
-    dockerfile: Dockerfile.goreleaser
+    dockerfile: Dockerfile-nonroot-static-debian12.goreleaser
     skip_push: false
     build_flag_templates:
       - "--pull"
@@ -171,42 +171,42 @@ dockers:
 
   # AMD64
   - image_templates:
-      - "launchdarkly/ld-relay:{{ .Version }}-debug-static-debian12-amd64"
-      - "launchdarkly/ld-relay:v{{ .Major }}-debug-static-debian12-amd64"
-      - "launchdarkly/ld-relay:latest-debug-static-debian12-amd64"
+      - "launchdarkly/ld-relay:{{ .Version }}-debug-nonroot-static-debian12-amd64"
+      - "launchdarkly/ld-relay:v{{ .Major }}-debug-nonroot-static-debian12-amd64"
+      - "launchdarkly/ld-relay:latest-debug-nonroot-static-debian12-amd64"
     use: buildx
     goos: linux
     goarch: amd64
-    dockerfile: Dockerfile-static-debian12.goreleaser
+    dockerfile: Dockerfile-debug-nonroot-static-debian12.goreleaser
     skip_push: false
     build_flag_templates:
       - "--pull"
       - "--platform=linux/amd64"
 
   # ARMv7
   - image_templates:
-      - "launchdarkly/ld-relay:{{ .Version }}-debug-static-debian12-armv7"
-      - "launchdarkly/ld-relay:v{{ .Major }}-debug-static-debian12-armv7"
-      - "launchdarkly/ld-relay:latest-debug-static-debian12-armv7"
+      - "launchdarkly/ld-relay:{{ .Version }}-debug-nonroot-static-debian12-armv7"
+      - "launchdarkly/ld-relay:v{{ .Major }}-debug-nonroot-static-debian12-armv7"
+      - "launchdarkly/ld-relay:latest-debug-nonroot-static-debian12-armv7"
     use: buildx
     goos: linux
     goarch: arm
     goarm: 7
-    dockerfile: Dockerfile-static-debian12.goreleaser
+    dockerfile: Dockerfile-debug-nonroot-static-debian12.goreleaser
     skip_push: false
     build_flag_templates:
       - "--pull"
       - "--platform=linux/arm/v7"
 
   # ARM64v8
   - image_templates:
-      - "launchdarkly/ld-relay:{{ .Version }}-debug-static-debian12-arm64v8"
-      - "launchdarkly/ld-relay:v{{ .Major }}-debug-static-debian12-arm64v8"
-      - "launchdarkly/ld-relay:latest-debug-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:{{ .Version }}-debug-nonroot-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:v{{ .Major }}-debug-nonroot-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:latest-debug-nonroot-static-debian12-arm64v8"
     use: buildx
     goos: linux
     goarch: arm64
-    dockerfile: Dockerfile.goreleaser
+    dockerfile: Dockerfile-debug-nonroot-static-debian12.goreleaser
     skip_push: false
     build_flag_templates:
       - "--pull"
@@ -239,45 +239,45 @@ docker_manifests:
       - "launchdarkly/ld-relay:latest-i386"
 
   # For the static debian12 image
-  - name_template: "launchdarkly/ld-relay:latest-static-debian12"
+  - name_template: "launchdarkly/ld-relay:latest-nonroot-static-debian12"
     skip_push: false
     image_templates:
-      - "launchdarkly/ld-relay:latest-static-debian12-amd64"
-      - "launchdarkly/ld-relay:latest-static-debian12-armv7"
-      - "launchdarkly/ld-relay:latest-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:latest-nonroot-static-debian12-amd64"
+      - "launchdarkly/ld-relay:latest-nonroot-static-debian12-armv7"
+      - "launchdarkly/ld-relay:latest-nonroot-static-debian12-arm64v8"
 
-  - name_template: "launchdarkly/ld-relay:{{ .Version}}-static-debian12"
+  - name_template: "launchdarkly/ld-relay:{{ .Version}}-nonroot-static-debian12"
     skip_push: false
     image_templates:
-       - "launchdarkly/ld-relay:{{ .Version }}-static-debian12-amd64"
-       - "launchdarkly/ld-relay:{{ .Version }}-static-debian12-armv7"
-       - "launchdarkly/ld-relay:{{ .Version }}-static-debian12-arm64v8"
+       - "launchdarkly/ld-relay:{{ .Version }}-nonroot-static-debian12-amd64"
+       - "launchdarkly/ld-relay:{{ .Version }}-nonroot-static-debian12-armv7"
+       - "launchdarkly/ld-relay:{{ .Version }}-nonroot-static-debian12-arm64v8"
 
-  - name_template: "launchdarkly/ld-relay:v{{ .Major }}-static-debian12"
+  - name_template: "launchdarkly/ld-relay:v{{ .Major }}-nonroot-static-debian12"
     skip_push: false
     image_templates:
-      - "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-amd64"
-      - "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-armv7"
-      - "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:v{{ .Major }}-nonroot-static-debian12-amd64"
+      - "launchdarkly/ld-relay:v{{ .Major }}-nonroot-static-debian12-armv7"
+      - "launchdarkly/ld-relay:v{{ .Major }}-nonroot-static-debian12-arm64v8"
 
   # For the debug static debian12 image
-  - name_template: "launchdarkly/ld-relay:latest-debug-static-debian12"
+  - name_template: "launchdarkly/ld-relay:latest-debug-nonroot-static-debian12"
     skip_push: false
     image_templates:
-      - "launchdarkly/ld-relay:latest-debug-static-debian12-amd64"
-      - "launchdarkly/ld-relay:latest-debug-static-debian12-armv7"
-      - "launchdarkly/ld-relay:latest-debug-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:latest-debug-nonroot-static-debian12-amd64"
+      - "launchdarkly/ld-relay:latest-debug-nonroot-static-debian12-armv7"
+      - "launchdarkly/ld-relay:latest-debug-nonroot-static-debian12-arm64v8"
 
-  - name_template: "launchdarkly/ld-relay:{{ .Version}}-debug-static-debian12"
+  - name_template: "launchdarkly/ld-relay:{{ .Version}}-debug-nonroot-static-debian12"
     skip_push: false
     image_templates:
-      - "launchdarkly/ld-relay:{{ .Version }}-debug-static-debian12-amd64"
-      - "launchdarkly/ld-relay:{{ .Version }}-debug-static-debian12-armv7"
-      - "launchdarkly/ld-relay:{{ .Version }}-debug-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:{{ .Version }}-debug-nonroot-static-debian12-amd64"
+      - "launchdarkly/ld-relay:{{ .Version }}-debug-nonroot-static-debian12-armv7"
+      - "launchdarkly/ld-relay:{{ .Version }}-debug-nonroot-static-debian12-arm64v8"
 
-  - name_template: "launchdarkly/ld-relay:v{{ .Major }}-debug-static-debian12"
+  - name_template: "launchdarkly/ld-relay:v{{ .Major }}-debug-nonroot-static-debian12"
     skip_push: false
     image_templates:
-      - "launchdarkly/ld-relay:v{{ .Major }}-debug-static-debian12-amd64"
-      - "launchdarkly/ld-relay:v{{ .Major }}-debug-static-debian12-armv7"
-      - "launchdarkly/ld-relay:v{{ .Major }}-debug-static-debian12-arm64v8"
+      - "launchdarkly/ld-relay:v{{ .Major }}-debug-nonroot-static-debian12-amd64"
+      - "launchdarkly/ld-relay:v{{ .Major }}-debug-nonroot-static-debian12-armv7"
+      - "launchdarkly/ld-relay:v{{ .Major }}-debug-nonroot-static-debian12-arm64v8"
diff --git a/...-static-debian12-debug-nonroot.goreleaser → ...-debug-nonroot-static-debian12.goreleaser b/...-static-debian12-debug-nonroot.goreleaser → ...-debug-nonroot-static-debian12.goreleaser
diff --git a/...erfile-static-debian12-nonroot.goreleaser → ...erfile-nonroot-static-debian12.goreleaser b/...erfile-static-debian12-nonroot.goreleaser → ...erfile-nonroot-static-debian12.goreleaser