Skip to content

Commit

Permalink
rename for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
@cwaldren-ld
cwaldren-ld committed Jun 7, 2024
1 parent bb416bf commit b50ab60
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 52 deletions.
96 changes: 48 additions & 48 deletions .goreleaser.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,42 +125,42 @@ dockers:

# AMD64
- image_templates:
- "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"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-nonroot-amd64"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-nonroot-amd64"
- "launchdarkly/ld-relay:latest-static-debian12-nonroot-amd64"
use: buildx
goos: linux
goarch: amd64
dockerfile: Dockerfile-nonroot-static-debian12.goreleaser
dockerfile: Dockerfile-static-debian12-nonroot.goreleaser
skip_push: false
build_flag_templates:
- "--pull"
- "--platform=linux/amd64"

# ARMv7
- image_templates:
- "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"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-nonroot-armv7"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-nonroot-armv7"
- "launchdarkly/ld-relay:latest-static-debian12-nonroot-armv7"
use: buildx
goos: linux
goarch: arm
goarm: 7
dockerfile: Dockerfile-nonroot-static-debian12.goreleaser
dockerfile: Dockerfile-static-debian12-nonroot.goreleaser
skip_push: false
build_flag_templates:
- "--pull"
- "--platform=linux/arm/v7"

# ARM64v8
- image_templates:
- "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"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-nonroot-arm64v8"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-nonroot-arm64v8"
- "launchdarkly/ld-relay:latest-static-debian12-nonroot-arm64v8"
use: buildx
goos: linux
goarch: arm64
dockerfile: Dockerfile-nonroot-static-debian12.goreleaser
dockerfile: Dockerfile-static-debian12-nonroot.goreleaser
skip_push: false
build_flag_templates:
- "--pull"
Expand All @@ -171,42 +171,42 @@ dockers:

# AMD64
- image_templates:
- "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"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-debug-nonroot-amd64"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-debug-nonroot-amd64"
- "launchdarkly/ld-relay:latest-static-debian12-debug-nonroot-amd64"
use: buildx
goos: linux
goarch: amd64
dockerfile: Dockerfile-debug-nonroot-static-debian12.goreleaser
dockerfile: Dockerfile-static-debian12-debug-nonroot.goreleaser
skip_push: false
build_flag_templates:
- "--pull"
- "--platform=linux/amd64"

# ARMv7
- image_templates:
- "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"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-debug-nonroot-armv7"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-debug-nonroot-armv7"
- "launchdarkly/ld-relay:latest-static-debian12-debug-nonroot-armv7"
use: buildx
goos: linux
goarch: arm
goarm: 7
dockerfile: Dockerfile-debug-nonroot-static-debian12.goreleaser
dockerfile: Dockerfile-static-debian12-debug-nonroot.goreleaser
skip_push: false
build_flag_templates:
- "--pull"
- "--platform=linux/arm/v7"

# ARM64v8
- image_templates:
- "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"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-debug-nonroot-arm64v8"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-debug-nonroot-arm64v8"
- "launchdarkly/ld-relay:latest-static-debian12-debug-nonroot-arm64v8"
use: buildx
goos: linux
goarch: arm64
dockerfile: Dockerfile-debug-nonroot-static-debian12.goreleaser
dockerfile: Dockerfile-static-debian12-debug-nonroot.goreleaser
skip_push: false
build_flag_templates:
- "--pull"
Expand Down Expand Up @@ -239,45 +239,45 @@ docker_manifests:
- "launchdarkly/ld-relay:latest-i386"

# For the static debian12 image
- name_template: "launchdarkly/ld-relay:latest-nonroot-static-debian12"
- name_template: "launchdarkly/ld-relay:latest-static-debian12-nonroot"
skip_push: false
image_templates:
- "launchdarkly/ld-relay:latest-nonroot-static-debian12-amd64"
- "launchdarkly/ld-relay:latest-nonroot-static-debian12-armv7"
- "launchdarkly/ld-relay:latest-nonroot-static-debian12-arm64v8"
- "launchdarkly/ld-relay:latest-static-debian12-nonroot-amd64"
- "launchdarkly/ld-relay:latest-static-debian12-nonroot-armv7"
- "launchdarkly/ld-relay:latest-static-debian12-nonroot-arm64v8"

- name_template: "launchdarkly/ld-relay:{{ .Version}}-nonroot-static-debian12"
- name_template: "launchdarkly/ld-relay:{{ .Version}}-static-debian12-nonroot"
skip_push: false
image_templates:
- "launchdarkly/ld-relay:{{ .Version }}-nonroot-static-debian12-amd64"
- "launchdarkly/ld-relay:{{ .Version }}-nonroot-static-debian12-armv7"
- "launchdarkly/ld-relay:{{ .Version }}-nonroot-static-debian12-arm64v8"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-nonroot-amd64"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-nonroot-armv7"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-nonroot-arm64v8"

- name_template: "launchdarkly/ld-relay:v{{ .Major }}-nonroot-static-debian12"
- name_template: "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-nonroot"
skip_push: false
image_templates:
- "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"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-nonroot-amd64"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-nonroot-armv7"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-nonroot-arm64v8"

# For the debug static debian12 image
- name_template: "launchdarkly/ld-relay:latest-debug-nonroot-static-debian12"
- name_template: "launchdarkly/ld-relay:latest-static-debian12-debug-nonroot"
skip_push: false
image_templates:
- "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"
- "launchdarkly/ld-relay:latest-static-debian12-debug-nonroot-amd64"
- "launchdarkly/ld-relay:latest-static-debian12-debug-nonroot-armv7"
- "launchdarkly/ld-relay:latest-static-debian12-debug-nonroot-arm64v8"

- name_template: "launchdarkly/ld-relay:{{ .Version}}-debug-nonroot-static-debian12"
- name_template: "launchdarkly/ld-relay:{{ .Version}}-static-debian12-debug-nonroot"
skip_push: false
image_templates:
- "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"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-debug-nonroot-amd64"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-debug-nonroot-armv7"
- "launchdarkly/ld-relay:{{ .Version }}-static-debian12-debug-nonroot-arm64v8"

- name_template: "launchdarkly/ld-relay:v{{ .Major }}-debug-nonroot-static-debian12"
- name_template: "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-debug-nonroot"
skip_push: false
image_templates:
- "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"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-debug-nonroot-amd64"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-debug-nonroot-armv7"
- "launchdarkly/ld-relay:v{{ .Major }}-static-debian12-debug-nonroot-arm64v8"
0 ...-debug-nonroot-static-debian12.goreleaser → ...-static-debian12-debug-nonroot.goreleaser
View file
File renamed without changes.
0 ...erfile-nonroot-static-debian12.goreleaser → ...erfile-static-debian12-nonroot.goreleaser
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions docs/docker.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ Please note that the default Distroless image does not contain a debug shell.
Relay's Distroless images are distributed in two variants. The first is intended for regular usage, while the
second is for debugging and contains a shell.

| Docker image tag suffix | Based on [Distroless](https://github.com/GoogleContainerTools/distroless) tag.. | Purpose |
|----------------------------------|---------------------------------------------------------------------------------|--------------------------|
| `-nonroot-static-debian12` | `static-debian12:nonroot` | Normal usage |
| `-debug-nonroot-static-debian12` | `static-debian12:debug-nonroot` | Contains a busybox shell |
| Docker image tag suffix | Based on [Distroless](https://github.com/GoogleContainerTools/distroless) tag.. | Purpose |
|-----------------------------------|---------------------------------------------------------------------------------|--------------------------|
| `-static-debian12-nonroot` | `static-debian12:nonroot` | Normal usage |
| `-static-debian12-debug-nonroot-` | `static-debian12:debug-nonroot` | Contains a busybox shell |



Expand Down

0 comments on commit b50ab60

Please sign in to comment.