diff --git a/renovate.json b/renovate.json index baf811724..fd055e7ce 100644 --- a/renovate.json +++ b/renovate.json @@ -84,7 +84,7 @@ { "fileMatch": ["\\.*\\.ya?ml$"], "matchStrings": [ - "# renovate: datasource=docker( versioning=(?.*?))?\n\\s*-\\s+(?[^:]+):(?.*)" + "# renovate: datasource=docker( versioning=(?.*?))?\n\\s+.+:(?[^:]+):(?.*)" ], "datasourceTemplate": "docker" }, @@ -238,7 +238,7 @@ "pinDigests": true }, { - "matchFileNames": ["package.json", "package-lock.json"], + "matchFileNames": ["package.json", "package-lock.json", "tasks/create.yaml"], "groupName": "pepr", "commitMessageTopic": "pepr" } diff --git a/tasks/create.yaml b/tasks/create.yaml index 1cb887cdb..6acf004c2 100644 --- a/tasks/create.yaml +++ b/tasks/create.yaml @@ -2,6 +2,10 @@ variables: - name: FLAVOR default: upstream + - name: REGISTRY1_PEPR_IMAGE + # renovate: datasource=docker versioning=semver + default: registry1.dso.mil/ironbank/opensource/defenseunicorns/pepr/controller:v0.27.0 + tasks: - name: standard-package description: "Create the UDS Core Zarf Package" @@ -47,6 +51,7 @@ tasks: actions: - description: "Build the UDS Core Pepr Module" cmd: | + CUSTOM_PEPR_IMAGE=$( [ "${FLAVOR}" = "registry1" ] && echo "--custom-image ${REGISTRY1_PEPR_IMAGE}" ) || CUSTOM_PEPR_IMAGE="" rm -fr dist npm ci - npx pepr build + npx pepr build $CUSTOM_PEPR_IMAGE