stack
/
ghost
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

fix: password in quotes
continuous-integration/drone/push Build is passing Details
continuous-integration/drone Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-10-06 20:08:40 +01:00
parent a899890c79
commit 2a0788b3ff
9 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone/build.sh
View File

@ -1,3 +1,3 @@
docker build ghost -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ghost \
docker build ghost -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/my-ghost \
--build-arg REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/

34
.drone/drone-home.yml
View File

@ -30,7 +30,7 @@ steps:
commands:
- set -e
- export REGISTRY=$${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/
- sh .drone/scripts/initialise-images.sh $${REGISTRY} $${REGISTRY_PASSWORD}
- sh .drone/scripts/initialise-images.sh $${REGISTRY} "$${REGISTRY_PASSWORD}"
volumes:
- name: dockersock
path: /var/run
@ -83,16 +83,32 @@ steps:
- mail_service
- mail_user
- commento_origin
- ghost_mail_password
- ghost_mail_service
- ghost_mail_user
- ghost_mysql_root_password
- mysql_root_password
script:
- rm -f env-ghost
- "echo \"export MAIL_SERVICE='$${MAIL_SERVICE}'\" >> env-ghost # \"mail-service\""
- "echo \"export MAIL_USER='$${MAIL_USER}'\" >> env-ghost # \"mail-user\""
- "echo \"export COMMENTO_ORIGIN='$${COMMENTO_ORIGIN}'\" >> env-ghost # \"commento-origin\""
- "echo \"export GHOST_MAIL_PASSWORD='$${GHOST_MAIL_PASSWORD}'\" >> env-ghost # \"ghost-mail-password\""
- "echo \"export GHOST_MAIL_SERVICE='$${GHOST_MAIL_SERVICE}'\" >> env-ghost # \"ghost-mail-service\""
- "echo \"export GHOST_MAIL_USER='$${GHOST_MAIL_USER}'\" >> env-ghost # \"ghost-mail-user\""
- "echo \"export GHOST_MYSQL_ROOT_PASSWORD='$${GHOST_MYSQL_ROOT_PASSWORD}'\" >> env-ghost # \"ghost-mysql-root-password\""
- "echo \"export MYSQL_ROOT_PASSWORD='$${MYSQL_ROOT_PASSWORD}'\" >> env-ghost # \"mysql-root-password\""
environment:
COMMENTO_ORIGIN:
from_secret: commento-origin
GHOST_MAIL_PASSWORD:
from_secret: ghost-mail-password
GHOST_MAIL_SERVICE:
from_secret: ghost-mail-service
GHOST_MAIL_USER:
from_secret: ghost-mail-user
GHOST_MYSQL_ROOT_PASSWORD:
from_secret: ghost-mysql-root-password
MAIL_SERVICE:
from_secret: mail-service
MAIL_USER:
@ -141,12 +157,20 @@ steps:
- mail_service
- mail_user
- commento_origin
- ghost_mail_password
- ghost_mail_service
- ghost_mail_user
- ghost_mysql_root_password
- mysql_root_password
script:
- export MYSQL_ROOT_PASSWORD=$${MYSQL_ROOT_PASSWORD}
- export MAIL_SERVICE=$${MAIL_SERVICE}
- export MAIL_USER=$${MAIL_USER}
- export COMMENTO_ORIGIN=$${COMMENTO_ORIGIN}
- export GHOST_MAIL_PASSWORD=$${GHOST_MAIL_PASSWORD}
- export GHOST_MAIL_SERVICE=$${GHOST_MAIL_SERVICE}
- export GHOST_MAIL_USER=$${GHOST_MAIL_USER}
- export GHOST_MYSQL_ROOT_PASSWORD=$${GHOST_MYSQL_ROOT_PASSWORD}
- export DOMAIN=$${DOMAIN}
- export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
- export REGISTRY_PORT=$${REGISTRY_PORT}
@ -159,6 +183,14 @@ steps:
environment:
COMMENTO_ORIGIN:
from_secret: commento-origin
GHOST_MAIL_PASSWORD:
from_secret: ghost-mail-password
GHOST_MAIL_SERVICE:
from_secret: ghost-mail-service
GHOST_MAIL_USER:
from_secret: ghost-mail-user
GHOST_MYSQL_ROOT_PASSWORD:
from_secret: ghost-mysql-root-password
MAIL_SERVICE:
from_secret: mail-service
MAIL_USER:

4
.drone/lib/public-secrets.libsonnet
View File

@ -2,4 +2,8 @@
'mail-service',
'mail-user',
'commento-origin',
'ghost-mail-password',
'ghost-mail-service',
'ghost-mail-user',
'ghost-mysql-root-password'
]

2
.drone/package.json
View File

@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
"@sigyl/jsonnet-drone": "^0.3.1"
"@sigyl/jsonnet-drone": "^0.4.0"
}
}

2
.drone/pull.sh
View File

@ -1 +1 @@
docker pull ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ghost
docker pull ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/my-ghost

2
.drone/push.sh
View File

@ -1 +1 @@
docker push ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ghost
docker push ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/my-ghost

2
.drone/scripts/login.sh
View File

@ -1,7 +1,7 @@
n=0
while :
do
docker login $1 --username client --password $2 \
docker login $1 --username client --password "$2" \
&& break # substitute your command here
n=$((n+1))
if [ $n -ge 10 ]; then

8
.drone/yarn.lock
View File

@ -12,10 +12,10 @@
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff"
integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw==
"@sigyl/jsonnet-drone@^0.3.1":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.3.1.tgz#790a83f45556cc613f07fbc98ca760027fa936e7"
integrity sha512-FiSyunjR0Udc20I2gA6gkzX3sCB2dPq/ZODrXcm7ROQFKF2Wr4b+xhpovjEdnjKGy8G4d+rRcdN+Jyhp7WQLEg==
"@sigyl/jsonnet-drone@^0.4.0":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.0.tgz#ebf7bc5e076d7252195fee7be2d1eafd24ee0435"
integrity sha512-96Adxqgo4SIU7skhiD0oPRproK4hy+Gvulym0p0bcSod5bv6b94BcYSfMyJye+sy6oRD0gosJY2uet1rgoB8UA==
dependencies:
"@sigyl/jsonnet-compose" "^0.0.2"
"@sigyl/jsonnet-drone-environment" "0.0.5"

2
docker-compose.yml
View File

@ -8,7 +8,7 @@ services:
replicas: 1
restart_policy:
condition: any
image: ${LOCAL_DOCKER_REGISTRY}ghost
image: ${LOCAL_DOCKER_REGISTRY}my-ghost
volumes:
- ghost-content-images:/var/lib/ghost/content/images
- ghost-content-settings:/var/lib/ghost/content/settings