feat: configurable theme
continuous-integration/drone/push Build is passing Details
continuous-integration/drone Build is failing Details

This commit is contained in:
Giles Bradshaw 2020-10-22 16:07:21 +01:00
parent 4fe4458543
commit dbf318b643
6 changed files with 19 additions and 14 deletions

View File

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

View File

@ -34,6 +34,7 @@ local config = {
publicSecrets, publicSecrets,
secretSecrets, secretSecrets,
[ [
'SCHEME',
'DOMAIN', 'DOMAIN',
'REGISTRY_DOMAIN', 'REGISTRY_DOMAIN',
'REGISTRY_PORT', 'REGISTRY_PORT',

View File

@ -88,14 +88,14 @@ steps:
- mail_service - mail_service
- mail_user - mail_user
- commento_origin - commento_origin
- scheme - theme
- 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 THEME='$${THEME}'\" >> env-ghost # \"theme\""
- "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:
@ -106,8 +106,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: THEME:
from_secret: scheme from_secret: theme
- name: scp - name: scp
image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47 image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
@ -143,6 +143,7 @@ steps:
- drone_build_number - drone_build_number
- drone_repo_name - drone_repo_name
- drone_repo_namespace - drone_repo_namespace
- scheme
- domain - domain
- registry_domain - registry_domain
- registry_port - registry_port
@ -150,13 +151,14 @@ steps:
- mail_service - mail_service
- mail_user - mail_user
- commento_origin - commento_origin
- scheme - theme
- 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 THEME=$${THEME}
- export SCHEME=$${SCHEME} - export SCHEME=$${SCHEME}
- export DOMAIN=$${DOMAIN} - export DOMAIN=$${DOMAIN}
- export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN} - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
@ -176,8 +178,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: THEME:
from_secret: scheme from_secret: theme
services: services:
- name: docker - name: docker

View File

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

View File

@ -12,10 +12,10 @@
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff" resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff"
integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw== integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw==
"@sigyl/jsonnet-drone@^0.4.0": "@sigyl/jsonnet-drone@^0.4.1":
version "0.4.0" version "0.4.1"
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.0.tgz#ebf7bc5e076d7252195fee7be2d1eafd24ee0435" resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.1.tgz#3527edb00f8bb860de1658f4c9fa6f81f932d3b7"
integrity sha512-96Adxqgo4SIU7skhiD0oPRproK4hy+Gvulym0p0bcSod5bv6b94BcYSfMyJye+sy6oRD0gosJY2uet1rgoB8UA== integrity sha512-+TOx51KJG1RxrPRZ2lPpia7a6Ms5UvkyLIuXuumPtenyxJ/pivY1TdcLvSAvFgVZHMjh9CxBCuOu8vNT1fPy2A==
dependencies: dependencies:
"@sigyl/jsonnet-compose" "^0.0.2" "@sigyl/jsonnet-compose" "^0.0.2"
"@sigyl/jsonnet-drone-environment" "0.0.5" "@sigyl/jsonnet-drone-environment" "0.0.5"

View File

@ -2,7 +2,8 @@ ARG REGISTRY
FROM ${REGISTRY}alpine/git:v2.26.2 as git FROM ${REGISTRY}alpine/git:v2.26.2 as git
WORKDIR /themes WORKDIR /themes
RUN git clone https://sigyl.com/git/themes/casper.git ARG THEME=https://sigyl.com/git/themes/casper.git
RUN git clone ${THEME}
FROM ${REGISTRY}ghost:3.14.0 FROM ${REGISTRY}ghost:3.14.0
# USER root # USER root