From dbf318b643c411ebc4ee2d383f1f28711e23069d Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Thu, 22 Oct 2020 16:07:21 +0100
Subject: [PATCH] feat: configurable theme

---
 .drone/build.sh                     |  3 ++-
 .drone/drone-home.jsonnet           |  1 +
 .drone/drone-home.yml               | 16 +++++++++-------
 .drone/lib/public-secrets.libsonnet |  2 +-
 .drone/yarn.lock                    |  8 ++++----
 ghost/Dockerfile                    |  3 ++-
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.drone/build.sh b/.drone/build.sh
index 79d65d1..0bff859 100644
--- a/.drone/build.sh
+++ b/.drone/build.sh
@@ -1,3 +1,4 @@
 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}
 
diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet
index e290111..f9aabe6 100644
--- a/.drone/drone-home.jsonnet
+++ b/.drone/drone-home.jsonnet
@@ -34,6 +34,7 @@ local config = {
     publicSecrets,
     secretSecrets,
     [
+      'SCHEME',
       'DOMAIN',
       'REGISTRY_DOMAIN',
       'REGISTRY_PORT',
diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index 0f09f9d..ceb8bb8 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -88,14 +88,14 @@ steps:
     - mail_service
     - mail_user
     - commento_origin
-    - scheme
+    - theme
     - 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 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\""
   environment:
     COMMENTO_ORIGIN:
@@ -106,8 +106,8 @@ steps:
       from_secret: mail-user
     MYSQL_ROOT_PASSWORD:
       from_secret: mysql-root-password
-    SCHEME:
-      from_secret: scheme
+    THEME:
+      from_secret: theme
 
 - name: scp
   image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
@@ -143,6 +143,7 @@ steps:
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
+    - scheme
     - domain
     - registry_domain
     - registry_port
@@ -150,13 +151,14 @@ steps:
     - mail_service
     - mail_user
     - commento_origin
-    - scheme
+    - theme
     - 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 THEME=$${THEME}
     - export SCHEME=$${SCHEME}
     - export DOMAIN=$${DOMAIN}
     - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
@@ -176,8 +178,8 @@ steps:
       from_secret: mail-user
     MYSQL_ROOT_PASSWORD:
       from_secret: mysql-root-password
-    SCHEME:
-      from_secret: scheme
+    THEME:
+      from_secret: theme
 
 services:
 - name: docker
diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet
index 05f09ed..e2f33e4 100644
--- a/.drone/lib/public-secrets.libsonnet
+++ b/.drone/lib/public-secrets.libsonnet
@@ -2,5 +2,5 @@
   'mail-service',
   'mail-user',
   'commento-origin',
-  'scheme'
+  'theme'
 ]
diff --git a/.drone/yarn.lock b/.drone/yarn.lock
index 903f335..415f02c 100644
--- a/.drone/yarn.lock
+++ b/.drone/yarn.lock
@@ -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.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==
+"@sigyl/jsonnet-drone@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.1.tgz#3527edb00f8bb860de1658f4c9fa6f81f932d3b7"
+  integrity sha512-+TOx51KJG1RxrPRZ2lPpia7a6Ms5UvkyLIuXuumPtenyxJ/pivY1TdcLvSAvFgVZHMjh9CxBCuOu8vNT1fPy2A==
   dependencies:
     "@sigyl/jsonnet-compose" "^0.0.2"
     "@sigyl/jsonnet-drone-environment" "0.0.5"
diff --git a/ghost/Dockerfile b/ghost/Dockerfile
index 310ed9e..852bdef 100644
--- a/ghost/Dockerfile
+++ b/ghost/Dockerfile
@@ -2,7 +2,8 @@ ARG REGISTRY
 FROM ${REGISTRY}alpine/git:v2.26.2 as git
 
 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
 # USER root