diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index b4e7a76..4da366f 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -91,6 +91,7 @@ steps: - registry_port - registry_password - scheme + - scheme - domain - drone_gitea_client_id - drone_gitea_server @@ -107,6 +108,7 @@ steps: - "echo \"export REGISTRY_PORT='$${REGISTRY_PORT}'\" >> env-drone # \"registry-port\"" - "echo \"export REGISTRY_PASSWORD='$${REGISTRY_PASSWORD}'\" >> env-drone # \"registry-password\"" - "echo \"export SCHEME='$${SCHEME}'\" >> env-drone # \"scheme\"" + - "echo \"export SCHEME='$${SCHEME}'\" >> env-drone # \"scheme\"" - "echo \"export DOMAIN='$${DOMAIN}'\" >> env-drone # \"domain\"" - "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\"" @@ -190,6 +192,7 @@ steps: - drone_build_number - drone_repo_name - drone_repo_namespace + - scheme - domain - drone_gitea_client_id - drone_gitea_server @@ -208,6 +211,7 @@ steps: - export DRONE_GITEA_CLIENT_SECRET=$${DRONE_GITEA_CLIENT_SECRET} - export DRONE_RPC_SECRET=$${DRONE_RPC_SECRET} - export SSH_KEY=$${SSH_KEY} + - export SCHEME=$${SCHEME} - export DOMAIN=$${DOMAIN} - export DRONE_GITEA_CLIENT_ID=$${DRONE_GITEA_CLIENT_ID} - export DRONE_GITEA_SERVER=$${DRONE_GITEA_SERVER} diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet index bb253d7..12b2420 100644 --- a/.drone/lib/public-secrets.libsonnet +++ b/.drone/lib/public-secrets.libsonnet @@ -1,4 +1,5 @@ [ + 'scheme', 'domain', 'drone-gitea-client-id', 'drone-gitea-server', diff --git a/docker-compose.yml b/docker-compose.yml index 391d100..48ba90e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,8 +10,8 @@ services: condition: any image: ${LOCAL_DOCKER_REGISTRY}drone/drone:1.9.0 volumes: - - drone:/var/lib/drone - - drone-data:/data + - drone-2:/var/lib/drone + - drone-data-2:/data environment: - DRONE_LOGS_DEBUG=true - DRONE_LOGS_PRETTY=true @@ -50,8 +50,8 @@ services: networks: - appnet volumes: - drone: - drone-data: + drone-2: + drone-data-2: networks: appnet: