Giles Bradshaw 1 year ago
parent
commit
b7e93331e4
6 changed files with 4 additions and 28 deletions
  1. +1
    -1
      .drone-do.star
  2. +1
    -1
      drone-starlark/repos/echo-secret.star
  3. +1
    -1
      drone-starlark/repos/echo.star
  4. +1
    -1
      drone-starlark/repos/export.star
  5. +0
    -10
      drone-starlark/repos/pipeline.star
  6. +0
    -14
      drone-starlark/repos/stack/more/public-secrets.star

+ 1
- 1
.drone-do.star View File

@@ -9,7 +9,7 @@ load("@this//:echo-secret.star", "echoSecret")
load("@this//:wait.star", "wait")
load("@this//:build.star", "build")
load("@this//:scp.star", "scp")
load("@this//stack/more:public-secrets.star", "publicSecrets")
load("@this//stack:public-secrets.star", "publicSecrets")
load("@this//stack:secret-secrets.star", "secretSecrets")
load("@this//:pull.star", "pull")
load("@this//:deploy.star", "deploy")


+ 1
- 1
drone-starlark/repos/echo-secret.star View File

@@ -3,5 +3,5 @@ load("@this//:secret-to-environment.star", "secretToEnvironment")
def echoSecret(secret):
return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format(
secret = secret,
environment = secretToEnvironment(secret), # .replace("-", "_").upper()
environment = secretToEnvironment(secret),
)

+ 1
- 1
drone-starlark/repos/echo.star View File

@@ -3,5 +3,5 @@ load("@this//:secret-to-environment.star", "secretToEnvironment")
def echo(secret):
return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format(
secret = secret,
environment = secretToEnvironment(secret), #secret.replace("-", "_").upper(),
environment = secretToEnvironment(secret),
)

+ 1
- 1
drone-starlark/repos/export.star View File

@@ -2,5 +2,5 @@ load("@this//:secret-to-environment.star", "secretToEnvironment")

def export(secret):
return "export {toCaps}=${toCaps}".format(
toCaps = secretToEnvironment(secret), #secret.replace("-", "_").upper(),
toCaps = secretToEnvironment(secret),
)

+ 0
- 10
drone-starlark/repos/pipeline.star View File

@@ -20,10 +20,6 @@ def pipeline(
"name": "dockersock",
"path": "/var/run",
},
#{
# "name": "ca",
# "path": "/etc/docker/certs.d",
#},
] + dockerVolumes,
}
],
@@ -32,11 +28,5 @@ def pipeline(
"name": "dockersock",
"temp": {},
},
#{
# "name": "ca",
# "host": {
# "path": "/home/giles/gitea-drone-stack/.ca",
# },
#},
] + volumes,
}

+ 0
- 14
drone-starlark/repos/stack/more/public-secrets.star View File

@@ -1,14 +0,0 @@
publicSecrets = [
"blog-domain",
"certbot-email",
"chat-domain",
"drone-domain",
"drone-gitea-client-id",
"drone-gitea-server",
"git-domain",
"local-docker-registry",
"remote-domain",
"ssh-user",
"guacamole-postgres-db",
"guacamole-postgres-user"
]