Allow customization of properties (#19)

Fixes #18 Signed-off-by: Juraci Paixão Kröhling <[email protected]>
open-telemetry · Sep 17, 2021 · 87bccd2 · 87bccd2
1 parent 4d29685
commit 87bccd2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -35,9 +35,9 @@ builds:
       - goos: windows
         goarch: arm64
 docker_manifests:
-  - name_template: otel/otelcol:{{ .Tag }}
+  - name_template: otel/opentelemetry-collector:{{ .Tag }}
     image_templates:
-      - otel/otelcol:{{ .Tag }}-amd64
+      - otel/opentelemetry-collector:{{ .Tag }}-amd64
 dockers:
   - image_templates:
       - "otel/otelcol:{{ .Tag }}-amd64"

diff --git a/distributions/otelcol/distribution.conf b/distributions/otelcol/distribution.conf
@@ -0,0 +1 @@
+CONTAINER_BASE_NAME=otel/opentelemetry-collector
diff --git a/scripts/generate-goreleaser-config.sh b/scripts/generate-goreleaser-config.sh
@@ -27,7 +27,16 @@ for template in $templates
 do
     for distribution in $(echo $distributions | tr "," "\n")
     do
-        sed "s/{distribution}/${distribution}/gi" "${TEMPLATES_DIR}/${template}.template.yaml" > "${GEN_YAML_DIR}/${distribution}-${template}.yaml"
+        export CONTAINER_BASE_NAME="otel/{distribution}"
+        DIST_CONF="${REPO_DIR}/distributions/${distribution}/distribution.conf"
+
+        if [ -f "${DIST_CONF}" ]; then
+            set -o allexport
+            source "${DIST_CONF}"
+            set +o allexport
+        fi
+
+        sed "s/{distribution}/${distribution}/gi" "${TEMPLATES_DIR}/${template}.template.yaml" | envsubst > "${GEN_YAML_DIR}/${distribution}-${template}.yaml"
         if [ $? != 0 ]; then
             echo "❌ ERROR: failed to generate '${template}' YAML snippets for '${distribution}'."
             exit 1

diff --git a/scripts/goreleaser-templates/docker-manifests.template.yaml b/scripts/goreleaser-templates/docker-manifests.template.yaml
@@ -1,4 +1,4 @@
 docker_manifests:
-  - name_template: otel/{distribution}:{{ .Tag }}
+  - name_template: ${CONTAINER_BASE_NAME}:{{ .Tag }}
     image_templates:
-      - otel/{distribution}:{{ .Tag }}-amd64
+      - ${CONTAINER_BASE_NAME}:{{ .Tag }}-amd64
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CONTAINER_BASE_NAME=otel/opentelemetry-collector