From 80f11d19687a6964b712ca9538f5842d6bf093bd Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 23 Oct 2020 17:23:02 +0100 Subject: [PATCH] fix: missing secrets --- .drone/drone-home.yml | 18 ++++++++++++++++++ .drone/lib/public-secrets.libsonnet | 2 ++ .drone/lib/secret-secrets.libsonnet | 3 ++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 6ddd0e6..a88a326 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -185,6 +185,8 @@ steps: - drone_repo_namespace - scheme - domain + - registry_domain + - registry_port - drone_gitea_client_id - drone_gitea_server - drone_server_host @@ -194,10 +196,13 @@ steps: - drone_gitea_client_secret - drone_rpc_secret - ssh_key + - registry_password script: - rm -f env-drone - "echo \"export SCHEME='$${SCHEME}'\" >> env-drone # \"scheme\"" - "echo \"export DOMAIN='$${DOMAIN}'\" >> env-drone # \"domain\"" + - "echo \"export REGISTRY_DOMAIN='$${REGISTRY_DOMAIN}'\" >> env-drone # \"registry-domain\"" + - "echo \"export REGISTRY_PORT='$${REGISTRY_PORT}'\" >> env-drone # \"registry-port\"" - "echo \"export DRONE_GITEA_CLIENT_ID='$${DRONE_GITEA_CLIENT_ID}'\" >> env-drone # \"drone-gitea-client-id\"" - "echo \"export DRONE_GITEA_SERVER='$${DRONE_GITEA_SERVER}'\" >> env-drone # \"drone-gitea-server\"" - "echo \"export DRONE_SERVER_HOST='$${DRONE_SERVER_HOST}'\" >> env-drone # \"drone-server-host\"" @@ -207,6 +212,7 @@ steps: - "echo \"export DRONE_GITEA_CLIENT_SECRET='$${DRONE_GITEA_CLIENT_SECRET}'\" >> env-drone # \"drone-gitea-client-secret\"" - "echo \"export DRONE_RPC_SECRET='$${DRONE_RPC_SECRET}'\" >> env-drone # \"drone-rpc-secret\"" - "echo \"export SSH_KEY='$${SSH_KEY}'\" >> env-drone # \"ssh-key\"" + - "echo \"export REGISTRY_PASSWORD='$${REGISTRY_PASSWORD}'\" >> env-drone # \"registry-password\"" environment: DOMAIN: from_secret: domain @@ -220,6 +226,12 @@ steps: from_secret: drone-rpc-secret DRONE_SERVER_HOST: from_secret: drone-server-host + REGISTRY_DOMAIN: + from_secret: registry-domain + REGISTRY_PASSWORD: + from_secret: registry-password + REGISTRY_PORT: + from_secret: registry-port SCHEME: from_secret: scheme SSH_HOST: @@ -317,6 +329,8 @@ steps: - drone_repo_namespace - scheme - domain + - registry_domain + - registry_port - drone_gitea_client_id - drone_gitea_server - drone_server_host @@ -326,6 +340,7 @@ steps: - drone_gitea_client_secret - drone_rpc_secret - ssh_key + - registry_password - registry_domain - registry_port - registry_password @@ -334,8 +349,11 @@ steps: - export DRONE_GITEA_CLIENT_SECRET=$${DRONE_GITEA_CLIENT_SECRET} - export DRONE_RPC_SECRET=$${DRONE_RPC_SECRET} - export SSH_KEY=$${SSH_KEY} + - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD} - export SCHEME=$${SCHEME} - export DOMAIN=$${DOMAIN} + - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN} + - export REGISTRY_PORT=$${REGISTRY_PORT} - export DRONE_GITEA_CLIENT_ID=$${DRONE_GITEA_CLIENT_ID} - export DRONE_GITEA_SERVER=$${DRONE_GITEA_SERVER} - export DRONE_SERVER_HOST=$${DRONE_SERVER_HOST} diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet index 12b2420..d3c9452 100644 --- a/.drone/lib/public-secrets.libsonnet +++ b/.drone/lib/public-secrets.libsonnet @@ -1,6 +1,8 @@ [ 'scheme', 'domain', + 'registry-domain', + 'registry-port', 'drone-gitea-client-id', 'drone-gitea-server', 'drone-server-host', diff --git a/.drone/lib/secret-secrets.libsonnet b/.drone/lib/secret-secrets.libsonnet index 2fe21bd..8b5c22a 100644 --- a/.drone/lib/secret-secrets.libsonnet +++ b/.drone/lib/secret-secrets.libsonnet @@ -1,5 +1,6 @@ [ 'drone-gitea-client-secret', 'drone-rpc-secret', - 'ssh-key' + 'ssh-key', + 'registry-password', ]