Skip to content

Commit 9df1d41

Browse files
jduimovichjduimovich
authored
Merge pull request #93 from jduimovich/env-var-declarations
add env vars declarations and comments for Image Registry user/pw
2 parents 9d02bb4 + e85d29c commit 9df1d41

File tree

8 files changed

+155
-42
lines changed

8 files changed

+155
-42
lines changed

‎generated/gitops-template/githubactions/.github/workflows/gitops-promotion.yml

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ env:
1313
# 🖊️ EDIT to change the image registry settings.
1414
# Registries such as GHCR, Quay.io, and Docker Hub are supported.
1515
IMAGE_REGISTRY: ${{ secrets.IMAGE_REGISTRY }}
16-
IMAGE_REGISTRY_USER: ${{ secrets.IMAGE_REGISTRY_USER }}
17-
IMAGE_REGISTRY_PASSWORD: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
1816

1917
# Used to verify the image signature and attestation
2018
COSIGN_PUBLIC_KEY: ${{ secrets.COSIGN_PUBLIC_KEY }}
@@ -25,8 +23,16 @@ env:
2523
TRUSTIFICATION_OIDC_CLIENT_ID: ${{ secrets.TRUSTIFICATION_OIDC_CLIENT_ID }}
2624
TRUSTIFICATION_OIDC_CLIENT_SECRET: ${{ secrets.TRUSTIFICATION_OIDC_CLIENT_SECRET }}
2725
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION: ${{ secrets.TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION }}
28-
QUAY_IO_CREDS_USR: ${{ secrets.QUAY_IO_CREDS_USR }}
29-
QUAY_IO_CREDS_PSW: ${{ secrets.QUAY_IO_CREDS_PSW }}
26+
# Set this to the user for your specific registry
27+
IMAGE_REGISTRY_USER: ${{ secrets.IMAGE_REGISTRY_USER }}
28+
# Set this password for your specific registry
29+
IMAGE_REGISTRY_PASSWORD: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
30+
# QUAY_IO_CREDS_USR: ${{ secrets.QUAY_IO_CREDS_USR }}
31+
# QUAY_IO_CREDS_PSW: ${{ secrets.QUAY_IO_CREDS_PSW }}
32+
# ARTIFACTORY_IO_CREDS_USR: ${{ secrets.ARTIFACTORY_IO_CREDS_USR }}
33+
# ARTIFACTORY_IO_CREDS_PSW: ${{ secrets.ARTIFACTORY_IO_CREDS_PSW }}
34+
# NEXUS_IO_CREDS_USR: ${{ secrets.NEXUS_IO_CREDS_USR }}
35+
# NEXUS_IO_CREDS_PSW: ${{ secrets.NEXUS_IO_CREDS_PSW }}
3036

3137
# 🖊️ EDIT to specify custom tags for the container image, or default tags will be generated below.
3238
IMAGE_TAGS: ""
@@ -53,17 +59,26 @@ jobs:
5359
script: |
5460
const secrets = {
5561
IMAGE_REGISTRY: `${{ secrets.IMAGE_REGISTRY }}`,
56-
IMAGE_REGISTRY_USER: `${{ secrets.IMAGE_REGISTRY_USER }}`,
57-
IMAGE_REGISTRY_PASSWORD: `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`,
5862
59-
COSIGN_PUBLIC_KEY: `${{ secrets.COSIGN_PUBLIC_KEY }}`,
60-
TRUSTIFICATION_BOMBASTIC_API_URL: `${{ secrets.TRUSTIFICATION_BOMBASTIC_API_URL }}`,
61-
TRUSTIFICATION_OIDC_ISSUER_URL: `${{ secrets.TRUSTIFICATION_OIDC_ISSUER_URL }}`,
62-
TRUSTIFICATION_OIDC_CLIENT_ID: `${{ secrets.TRUSTIFICATION_OIDC_CLIENT_ID }}`,
63-
TRUSTIFICATION_OIDC_CLIENT_SECRET: `${{ secrets.TRUSTIFICATION_OIDC_CLIENT_SECRET }}`,
64-
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION: `${{ secrets.TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION }}`,
65-
QUAY_IO_CREDS_USR: `${{ secrets.QUAY_IO_CREDS_USR }}`,
66-
QUAY_IO_CREDS_PSW: `${{ secrets.QUAY_IO_CREDS_PSW }}`,
63+
/* Used to verify the image signature and attestation */
64+
COSIGN_PUBLIC_KEY: `${{ secrets.COSIGN_PUBLIC_KEY }}`,
65+
/* URL of the BOMbastic api host (e.g. https://sbom.trustification.dev) */
66+
TRUSTIFICATION_BOMBASTIC_API_URL: `${{ secrets.TRUSTIFICATION_BOMBASTIC_API_URL }}`,
67+
/* URL of the OIDC token issuer (e.g. https://sso.trustification.dev/realms/chicken) */
68+
TRUSTIFICATION_OIDC_ISSUER_URL: `${{ secrets.TRUSTIFICATION_OIDC_ISSUER_URL }}`,
69+
TRUSTIFICATION_OIDC_CLIENT_ID: `${{ secrets.TRUSTIFICATION_OIDC_CLIENT_ID }}`,
70+
TRUSTIFICATION_OIDC_CLIENT_SECRET: `${{ secrets.TRUSTIFICATION_OIDC_CLIENT_SECRET }}`,
71+
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION: `${{ secrets.TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION }}`,
72+
/* Set this to the user for your specific registry */
73+
IMAGE_REGISTRY_USER: `${{ secrets.IMAGE_REGISTRY_USER }}`,
74+
/* Set this password for your specific registry */
75+
IMAGE_REGISTRY_PASSWORD: `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`,
76+
/*QUAY_IO_CREDS_USR: `${{ secrets.QUAY_IO_CREDS_USR }}`, */
77+
/*QUAY_IO_CREDS_PSW: `${{ secrets.QUAY_IO_CREDS_PSW }}`, */
78+
/*ARTIFACTORY_IO_CREDS_USR: `${{ secrets.ARTIFACTORY_IO_CREDS_USR }}`, */
79+
/*ARTIFACTORY_IO_CREDS_PSW: `${{ secrets.ARTIFACTORY_IO_CREDS_PSW }}`, */
80+
/*NEXUS_IO_CREDS_USR: `${{ secrets.NEXUS_IO_CREDS_USR }}`, */
81+
/*NEXUS_IO_CREDS_PSW: `${{ secrets.NEXUS_IO_CREDS_PSW }}`, */
6782
};
6883
const missingSecrets = Object.entries(secrets).filter(([ name, value ]) => {
6984
if (value.length === 0) {

‎generated/gitops-template/jenkins/Jenkinsfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ pipeline {
1919
TRUSTIFICATION_OIDC_CLIENT_ID = credentials('TRUSTIFICATION_OIDC_CLIENT_ID')
2020
TRUSTIFICATION_OIDC_CLIENT_SECRET = credentials('TRUSTIFICATION_OIDC_CLIENT_SECRET')
2121
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION = credentials('TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION')
22+
/* Set this to the user for your specific registry */
23+
/* IMAGE_REGISTRY_USER = credentials('IMAGE_REGISTRY_USER') */
24+
/* Set this password for your specific registry */
25+
/* IMAGE_REGISTRY_PASSWORD = credentials('IMAGE_REGISTRY_PASSWORD') */
2226
QUAY_IO_CREDS = credentials('QUAY_IO_CREDS')
27+
/* ARTIFACTORY_IO_CREDS = credentials('ARTIFACTORY_IO_CREDS') */
28+
/* NEXUS_IO_CREDS = credentials('NEXUS_IO_CREDS') */
2329
}
2430
stages {
2531
stage('Verify EC') {

‎generated/source-repo/githubactions/.github/workflows/build-and-update-gitops.yml

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,22 @@ env:
1313
# 🖊️ EDIT to change the image registry settings.
1414
# Registries such as GHCR, Quay.io, and Docker Hub are supported.
1515
IMAGE_REGISTRY: ${{ secrets.IMAGE_REGISTRY }}
16-
IMAGE_REGISTRY_USER: ${{ secrets.IMAGE_REGISTRY_USER }}
17-
IMAGE_REGISTRY_PASSWORD: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
1816

1917
ROX_API_TOKEN: ${{ secrets.ROX_API_TOKEN }}
2018
ROX_CENTRAL_ENDPOINT: ${{ secrets.ROX_CENTRAL_ENDPOINT }}
2119
GITOPS_AUTH_PASSWORD: ${{ secrets.GITOPS_AUTH_PASSWORD }}
22-
QUAY_IO_CREDS_USR: ${{ secrets.QUAY_IO_CREDS_USR }}
23-
QUAY_IO_CREDS_PSW: ${{ secrets.QUAY_IO_CREDS_PSW }}
20+
# Uncomment this when using Gitlab
21+
# GITOPS_AUTH_USERNAME: ${{ secrets.GITOPS_AUTH_USERNAME }}
22+
# Set this to the user for your specific registry
23+
IMAGE_REGISTRY_USER: ${{ secrets.IMAGE_REGISTRY_USER }}
24+
# Set this password for your specific registry
25+
IMAGE_REGISTRY_PASSWORD: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
26+
# QUAY_IO_CREDS_USR: ${{ secrets.QUAY_IO_CREDS_USR }}
27+
# QUAY_IO_CREDS_PSW: ${{ secrets.QUAY_IO_CREDS_PSW }}
28+
# ARTIFACTORY_IO_CREDS_USR: ${{ secrets.ARTIFACTORY_IO_CREDS_USR }}
29+
# ARTIFACTORY_IO_CREDS_PSW: ${{ secrets.ARTIFACTORY_IO_CREDS_PSW }}
30+
# NEXUS_IO_CREDS_USR: ${{ secrets.NEXUS_IO_CREDS_USR }}
31+
# NEXUS_IO_CREDS_PSW: ${{ secrets.NEXUS_IO_CREDS_PSW }}
2432
COSIGN_SECRET_PASSWORD: ${{ secrets.COSIGN_SECRET_PASSWORD }}
2533
COSIGN_SECRET_KEY: ${{ secrets.COSIGN_SECRET_KEY }}
2634
COSIGN_PUBLIC_KEY: ${{ secrets.COSIGN_PUBLIC_KEY }}
@@ -56,17 +64,25 @@ jobs:
5664
script: |
5765
const secrets = {
5866
IMAGE_REGISTRY: `${{ secrets.IMAGE_REGISTRY }}`,
59-
IMAGE_REGISTRY_USER: `${{ secrets.IMAGE_REGISTRY_USER }}`,
60-
IMAGE_REGISTRY_PASSWORD: `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`,
6167
62-
ROX_API_TOKEN: `${{ secrets.ROX_API_TOKEN }}`,
63-
ROX_CENTRAL_ENDPOINT: `${{ secrets.ROX_CENTRAL_ENDPOINT }}`,
64-
GITOPS_AUTH_PASSWORD: `${{ secrets.GITOPS_AUTH_PASSWORD }}`,
65-
QUAY_IO_CREDS_USR: `${{ secrets.QUAY_IO_CREDS_USR }}`,
66-
QUAY_IO_CREDS_PSW: `${{ secrets.QUAY_IO_CREDS_PSW }}`,
67-
COSIGN_SECRET_PASSWORD: `${{ secrets.COSIGN_SECRET_PASSWORD }}`,
68-
COSIGN_SECRET_KEY: `${{ secrets.COSIGN_SECRET_KEY }}`,
69-
COSIGN_PUBLIC_KEY: `${{ secrets.COSIGN_PUBLIC_KEY }}`,
68+
ROX_API_TOKEN: `${{ secrets.ROX_API_TOKEN }}`,
69+
ROX_CENTRAL_ENDPOINT: `${{ secrets.ROX_CENTRAL_ENDPOINT }}`,
70+
GITOPS_AUTH_PASSWORD: `${{ secrets.GITOPS_AUTH_PASSWORD }}`,
71+
/* Uncomment this when using Gitlab */
72+
/*GITOPS_AUTH_USERNAME: `${{ secrets.GITOPS_AUTH_USERNAME }}`, */
73+
/* Set this to the user for your specific registry */
74+
IMAGE_REGISTRY_USER: `${{ secrets.IMAGE_REGISTRY_USER }}`,
75+
/* Set this password for your specific registry */
76+
IMAGE_REGISTRY_PASSWORD: `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`,
77+
/*QUAY_IO_CREDS_USR: `${{ secrets.QUAY_IO_CREDS_USR }}`, */
78+
/*QUAY_IO_CREDS_PSW: `${{ secrets.QUAY_IO_CREDS_PSW }}`, */
79+
/*ARTIFACTORY_IO_CREDS_USR: `${{ secrets.ARTIFACTORY_IO_CREDS_USR }}`, */
80+
/*ARTIFACTORY_IO_CREDS_PSW: `${{ secrets.ARTIFACTORY_IO_CREDS_PSW }}`, */
81+
/*NEXUS_IO_CREDS_USR: `${{ secrets.NEXUS_IO_CREDS_USR }}`, */
82+
/*NEXUS_IO_CREDS_PSW: `${{ secrets.NEXUS_IO_CREDS_PSW }}`, */
83+
COSIGN_SECRET_PASSWORD: `${{ secrets.COSIGN_SECRET_PASSWORD }}`,
84+
COSIGN_SECRET_KEY: `${{ secrets.COSIGN_SECRET_KEY }}`,
85+
COSIGN_PUBLIC_KEY: `${{ secrets.COSIGN_PUBLIC_KEY }}`,
7086
7187
};
7288
const missingSecrets = Object.entries(secrets).filter(([ name, value ]) => {

‎generated/source-repo/jenkins/Jenkinsfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ pipeline {
1212
GITOPS_AUTH_PASSWORD = credentials('GITOPS_AUTH_PASSWORD')
1313
/* Uncomment this when using Gitlab */
1414
/* GITOPS_AUTH_USERNAME = credentials('GITOPS_AUTH_USERNAME') */
15+
/* Set this to the user for your specific registry */
16+
/* IMAGE_REGISTRY_USER = credentials('IMAGE_REGISTRY_USER') */
17+
/* Set this password for your specific registry */
18+
/* IMAGE_REGISTRY_PASSWORD = credentials('IMAGE_REGISTRY_PASSWORD') */
19+
/* Default registry is set to quay.io */
1520
QUAY_IO_CREDS = credentials('QUAY_IO_CREDS')
21+
/* ARTIFACTORY_IO_CREDS = credentials('ARTIFACTORY_IO_CREDS') */
22+
/* NEXUS_IO_CREDS = credentials('NEXUS_IO_CREDS') */
1623
COSIGN_SECRET_PASSWORD = credentials('COSIGN_SECRET_PASSWORD')
1724
COSIGN_SECRET_KEY = credentials('COSIGN_SECRET_KEY')
1825
COSIGN_PUBLIC_KEY = credentials('COSIGN_PUBLIC_KEY')

‎rhtap/init.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ REQUIRED_BINARY+="python3 "
2222
# BUILD TARGETS AND REGISTRY
2323
# remember to leave a space when you add them to a prior ENV list
2424
REQUIRED_ENV="IMAGE_URL IMAGE "
25-
REQUIRED_ENV+="QUAY_IO_CREDS_USR QUAY_IO_CREDS_PSW "
2625
# Cosign signing
2726
REQUIRED_ENV+="COSIGN_SECRET_PASSWORD COSIGN_SECRET_KEY COSIGN_PUBLIC_KEY "
2827
# SCANS

‎templates/data.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,49 @@ build_secrets:
2020
- name: GITOPS_AUTH_USERNAME
2121
commented_out: true
2222
comment: Uncomment this when using Gitlab
23+
24+
- name: IMAGE_REGISTRY_USER
25+
if: 'isGitHub'
26+
comment: "Set this to the user for your specific registry"
27+
- name: IMAGE_REGISTRY_PASSWORD
28+
if: 'isGitHub'
29+
comment: "Set this password for your specific registry"
30+
- name: IMAGE_REGISTRY_USER
31+
if: '!isGitHub'
32+
commented_out: true
33+
comment: "Set this to the user for your specific registry"
34+
- name: IMAGE_REGISTRY_PASSWORD
2335
if: '!isGitHub'
36+
commented_out: true
37+
comment: "Set this password for your specific registry"
38+
2439
- name: QUAY_IO_CREDS
2540
if: isJenkins
41+
comment: "Default registry is set to quay.io"
2642
- name: QUAY_IO_CREDS_USR
2743
if: '!isJenkins'
44+
commented_out: true
2845
- name: QUAY_IO_CREDS_PSW
46+
if: '!isJenkins'
47+
commented_out: true
48+
- name: ARTIFACTORY_IO_CREDS
49+
if: isJenkins
50+
commented_out: true
51+
- name: ARTIFACTORY_IO_CREDS_USR
52+
if: '!isJenkins'
53+
commented_out: true
54+
- name: ARTIFACTORY_IO_CREDS_PSW
55+
if: '!isJenkins'
56+
commented_out: true
57+
- name: NEXUS_IO_CREDS
58+
if: isJenkins
59+
commented_out: true
60+
- name: NEXUS_IO_CREDS_USR
2961
if: '!isJenkins'
62+
commented_out: true
63+
- name: NEXUS_IO_CREDS_PSW
64+
if: '!isJenkins'
65+
commented_out: true
3066
- name: COSIGN_SECRET_PASSWORD
3167
- name: COSIGN_SECRET_KEY
3268
- name: COSIGN_PUBLIC_KEY
@@ -49,9 +85,48 @@ gitops_secrets:
4985
- name: TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION
5086
# If the OCI registry is not public then ec needs some credentials so it can see the attestations.
5187
# Todo: Use different credentials here so we provide read access only instead of read/write access.
88+
# github always uses these
89+
- name: IMAGE_REGISTRY_USER
90+
if: 'isGitHub'
91+
comment: "Set this to the user for your specific registry"
92+
- name: IMAGE_REGISTRY_PASSWORD
93+
if: 'isGitHub'
94+
comment: "Set this password for your specific registry"
95+
# other CIs in transition so comment out and leave Quay.io
96+
- name: IMAGE_REGISTRY_USER
97+
if: '!isGitHub'
98+
commented_out: true
99+
comment: "Set this to the user for your specific registry"
100+
- name: IMAGE_REGISTRY_PASSWORD
101+
if: '!isGitHub'
102+
commented_out: true
103+
comment: "Set this password for your specific registry"
104+
# show all the values options in the jenkins file and other CIs
105+
# this gives users a way to know what to set. Not perfect but better
106+
# to be documented
52107
- name: QUAY_IO_CREDS
53108
if: isJenkins
54109
- name: QUAY_IO_CREDS_USR
55110
if: '!isJenkins'
111+
commented_out: true
56112
- name: QUAY_IO_CREDS_PSW
113+
if: '!isJenkins'
114+
commented_out: true
115+
- name: ARTIFACTORY_IO_CREDS
116+
if: isJenkins
117+
commented_out: true
118+
- name: ARTIFACTORY_IO_CREDS_USR
119+
if: '!isJenkins'
120+
commented_out: true
121+
- name: ARTIFACTORY_IO_CREDS_PSW
122+
if: '!isJenkins'
123+
commented_out: true
124+
- name: NEXUS_IO_CREDS
125+
if: isJenkins
126+
commented_out: true
127+
- name: NEXUS_IO_CREDS_USR
57128
if: '!isJenkins'
129+
commented_out: true
130+
- name: NEXUS_IO_CREDS_PSW
131+
if: '!isJenkins'
132+
commented_out: true

‎templates/gitops-template/gitops-promotion.yml.njk

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ env:
1313
# 🖊️ EDIT to change the image registry settings.
1414
# Registries such as GHCR, Quay.io, and Docker Hub are supported.
1515
IMAGE_REGISTRY: ${{ "secrets.IMAGE_REGISTRY" | inCurlies }}
16-
IMAGE_REGISTRY_USER: ${{ "secrets.IMAGE_REGISTRY_USER" | inCurlies }}
17-
IMAGE_REGISTRY_PASSWORD: ${{ "secrets.IMAGE_REGISTRY_PASSWORD" | inCurlies }}
1816
{% for secret in gitops_secrets %}
1917
{%- if secret | eval_if_condition %}
2018
{%- if secret.comment %}
2119
# {{ secret.comment }}
2220
{%- endif %}
23-
{{ secret.name }}: ${{ ("secrets." + secret.name) | inCurlies }}
21+
{% if secret.commented_out %}# {% endif %}{{ secret.name }}: ${{ ("secrets." + secret.name) | inCurlies }}
2422
{%- endif %}
2523
{%- endfor %}
2624

@@ -52,11 +50,12 @@ jobs:
5250
#}
5351
const secrets = {
5452
IMAGE_REGISTRY: `${{ "secrets.IMAGE_REGISTRY" | inCurlies }}`,
55-
IMAGE_REGISTRY_USER: `${{ "secrets.IMAGE_REGISTRY_USER" | inCurlies }}`,
56-
IMAGE_REGISTRY_PASSWORD: `${{ "secrets.IMAGE_REGISTRY_PASSWORD" | inCurlies }}`,
5753
{% for secret in gitops_secrets %}
5854
{%- if secret | eval_if_condition %}
59-
{{ secret.name }}: `${{ ("secrets." + secret.name) | inCurlies }}`,
55+
{%- if secret.comment %}
56+
/* {{ secret.comment }} */
57+
{%- endif %}
58+
{% if secret.commented_out %}/*{% endif %}{{ secret.name }}: `${{ ("secrets." + secret.name) | inCurlies }}`, {% if secret.commented_out %}*/{% endif %}
6059
{%- endif %}
6160
{%- endfor %}
6261
};

‎templates/source-repo/build-and-update-gitops.yml.njk

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ env:
1313
# 🖊️ EDIT to change the image registry settings.
1414
# Registries such as GHCR, Quay.io, and Docker Hub are supported.
1515
IMAGE_REGISTRY: ${{ "secrets.IMAGE_REGISTRY" | inCurlies }}
16-
IMAGE_REGISTRY_USER: ${{ "secrets.IMAGE_REGISTRY_USER" | inCurlies }}
17-
IMAGE_REGISTRY_PASSWORD: ${{ "secrets.IMAGE_REGISTRY_PASSWORD" | inCurlies }}
1816
{% for secret in build_secrets %}
1917
{%- if secret | eval_if_condition %}
2018
{%- if secret.comment %}
@@ -58,14 +56,12 @@ jobs:
5856
#}
5957
const secrets = {
6058
IMAGE_REGISTRY: `${{ "secrets.IMAGE_REGISTRY" | inCurlies }}`,
61-
IMAGE_REGISTRY_USER: `${{ "secrets.IMAGE_REGISTRY_USER" | inCurlies }}`,
62-
IMAGE_REGISTRY_PASSWORD: `${{ "secrets.IMAGE_REGISTRY_PASSWORD" | inCurlies }}`,
6359
{% for secret in build_secrets %}
6460
{%- if secret | eval_if_condition %}
6561
{%- if secret.comment %}
66-
# {{ secret.comment }}
67-
{%- endif %}
68-
{% if secret.commented_out %}# {% endif %}{{ secret.name }}: `${{ ("secrets." + secret.name) | inCurlies }}`,
62+
/* {{ secret.comment }} */
63+
{%- endif %}
64+
{% if secret.commented_out %}/*{% endif %}{{ secret.name }}: `${{ ("secrets." + secret.name) | inCurlies }}`, {% if secret.commented_out %}*/{% endif %}
6965
{%- endif %}
7066
{%- endfor %}
7167

0 commit comments

Comments
 (0)