feat: scheme is configured

This commit is contained in:
Giles Bradshaw 2020-10-22 15:35:59 +01:00
parent ad7601e7a1
commit ca0e2e73e7
4 changed files with 11 additions and 1 deletions

View File

@ -83,12 +83,14 @@ steps:
- mail_service - mail_service
- mail_user - mail_user
- commento_origin - commento_origin
- scheme
- mysql_root_password - mysql_root_password
script: script:
- rm -f env-ghost - rm -f env-ghost
- "echo \"export MAIL_SERVICE='$${MAIL_SERVICE}'\" >> env-ghost # \"mail-service\"" - "echo \"export MAIL_SERVICE='$${MAIL_SERVICE}'\" >> env-ghost # \"mail-service\""
- "echo \"export MAIL_USER='$${MAIL_USER}'\" >> env-ghost # \"mail-user\"" - "echo \"export MAIL_USER='$${MAIL_USER}'\" >> env-ghost # \"mail-user\""
- "echo \"export COMMENTO_ORIGIN='$${COMMENTO_ORIGIN}'\" >> env-ghost # \"commento-origin\"" - "echo \"export COMMENTO_ORIGIN='$${COMMENTO_ORIGIN}'\" >> env-ghost # \"commento-origin\""
- "echo \"export SCHEME='$${SCHEME}'\" >> env-ghost # \"scheme\""
- "echo \"export MYSQL_ROOT_PASSWORD='$${MYSQL_ROOT_PASSWORD}'\" >> env-ghost # \"mysql-root-password\"" - "echo \"export MYSQL_ROOT_PASSWORD='$${MYSQL_ROOT_PASSWORD}'\" >> env-ghost # \"mysql-root-password\""
environment: environment:
COMMENTO_ORIGIN: COMMENTO_ORIGIN:
@ -99,6 +101,8 @@ steps:
from_secret: mail-user from_secret: mail-user
MYSQL_ROOT_PASSWORD: MYSQL_ROOT_PASSWORD:
from_secret: mysql-root-password from_secret: mysql-root-password
SCHEME:
from_secret: scheme
- name: scp - name: scp
image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47 image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
@ -141,12 +145,14 @@ steps:
- mail_service - mail_service
- mail_user - mail_user
- commento_origin - commento_origin
- scheme
- mysql_root_password - mysql_root_password
script: script:
- export MYSQL_ROOT_PASSWORD=$${MYSQL_ROOT_PASSWORD} - export MYSQL_ROOT_PASSWORD=$${MYSQL_ROOT_PASSWORD}
- export MAIL_SERVICE=$${MAIL_SERVICE} - export MAIL_SERVICE=$${MAIL_SERVICE}
- export MAIL_USER=$${MAIL_USER} - export MAIL_USER=$${MAIL_USER}
- export COMMENTO_ORIGIN=$${COMMENTO_ORIGIN} - export COMMENTO_ORIGIN=$${COMMENTO_ORIGIN}
- export SCHEME=$${SCHEME}
- export DOMAIN=$${DOMAIN} - export DOMAIN=$${DOMAIN}
- export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN} - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
- export REGISTRY_PORT=$${REGISTRY_PORT} - export REGISTRY_PORT=$${REGISTRY_PORT}
@ -165,6 +171,8 @@ steps:
from_secret: mail-user from_secret: mail-user
MYSQL_ROOT_PASSWORD: MYSQL_ROOT_PASSWORD:
from_secret: mysql-root-password from_secret: mysql-root-password
SCHEME:
from_secret: scheme
services: services:
- name: docker - name: docker

View File

@ -2,4 +2,5 @@
'mail-service', 'mail-service',
'mail-user', 'mail-user',
'commento-origin', 'commento-origin',
'scheme'
] ]

View File

@ -17,6 +17,7 @@ services:
- ghost-content-logs:/var/lib/ghost/content/logs - ghost-content-logs:/var/lib/ghost/content/logs
environment: environment:
- DOMAIN=$DOMAIN - DOMAIN=$DOMAIN
- SCHEME=$SCHEME
- MAIL-SERVICE=$MAIL-SERVICE - MAIL-SERVICE=$MAIL-SERVICE
- MAIL-USER=$MAIL-USER - MAIL-USER=$MAIL-USER
- MAIL-PASSWORD=$MAIL-PASSWORD - MAIL-PASSWORD=$MAIL-PASSWORD

View File

@ -1,5 +1,5 @@
{ {
"url": "https://${DOMAIN}/", "url": "${SCHEME}://${DOMAIN}/",
"server": { "server": {
"port": 2368, "port": 2368,
"host": "0.0.0.0" "host": "0.0.0.0"