.
This commit is contained in:
parent
3a9452f6a0
commit
df3188e33f
|
@ -85,21 +85,13 @@ steps:
|
|||
- drone_build_number
|
||||
- drone_repo_name
|
||||
- drone_repo_namespace
|
||||
- postgres_db
|
||||
- postgres_user
|
||||
- postgres_password
|
||||
script:
|
||||
- rm -f env-guacamole
|
||||
- "echo \"export POSTGRES_DB='$${POSTGRES_DB}'\" >> env-guacamole # \"postgres-db\""
|
||||
- "echo \"export POSTGRES_USER='$${POSTGRES_USER}'\" >> env-guacamole # \"postgres-user\""
|
||||
- "echo \"export POSTGRES_PASSWORD='$${POSTGRES_PASSWORD}'\" >> env-guacamole # \"postgres-password\""
|
||||
environment:
|
||||
POSTGRES_DB:
|
||||
from_secret: postgres-db
|
||||
POSTGRES_PASSWORD:
|
||||
from_secret: postgres-password
|
||||
POSTGRES_USER:
|
||||
from_secret: postgres-user
|
||||
|
||||
- name: scp
|
||||
image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
|
||||
|
@ -138,13 +130,9 @@ steps:
|
|||
- registry_domain
|
||||
- registry_port
|
||||
- registry_password
|
||||
- postgres_db
|
||||
- postgres_user
|
||||
- postgres_password
|
||||
script:
|
||||
- export POSTGRES_PASSWORD=$${POSTGRES_PASSWORD}
|
||||
- export POSTGRES_DB=$${POSTGRES_DB}
|
||||
- export POSTGRES_USER=$${POSTGRES_USER}
|
||||
- export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
|
||||
- export REGISTRY_PORT=$${REGISTRY_PORT}
|
||||
- export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}
|
||||
|
@ -154,12 +142,8 @@ steps:
|
|||
- sh .drone/pull.sh
|
||||
- sh .drone/deploy.sh
|
||||
environment:
|
||||
POSTGRES_DB:
|
||||
from_secret: postgres-db
|
||||
POSTGRES_PASSWORD:
|
||||
from_secret: postgres-password
|
||||
POSTGRES_USER:
|
||||
from_secret: postgres-user
|
||||
|
||||
services:
|
||||
- name: docker
|
||||
|
|
|
@ -1,4 +1 @@
|
|||
[
|
||||
'postgres-db',
|
||||
'postgres-user',
|
||||
]
|
||||
[]
|
||||
|
|
|
@ -40,7 +40,7 @@ services:
|
|||
environment:
|
||||
- POSTGRES_HOSTNAME=guacamole-postgresql
|
||||
- POSTGRES_PORT=5432
|
||||
- POSTGRES_USER=${POSTGRES_USER}
|
||||
- POSTGRES_USER=guacamole_user
|
||||
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
||||
- POSTGRES_DATABASE=guacamole_db
|
||||
- GUACD_HOSTNAME=guacd
|
||||
|
|
Loading…
Reference in New Issue