From aa8bb4babb687f30682ef2a3422f9ef400f867c4 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Wed, 8 Jun 2022 08:53:11 +0100
Subject: [PATCH] .

---
 .drone/build.sh       |  2 +-
 .drone/deploy.sh      |  1 +
 .drone/drone-home.yml | 14 +++++++-------
 docker-compose.yml    |  5 +++--
 ghost/Dockerfile      | 11 +++++++----
 ghost/run.sh          |  1 +
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.drone/build.sh b/.drone/build.sh
index 99915d9..274ccd5 100644
--- a/.drone/build.sh
+++ b/.drone/build.sh
@@ -1,4 +1,4 @@
 docker build ghost -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/my-ghost \
-  --build-arg REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/ \
+  --build-arg REGISTRY=\ #${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ \
   --build-arg THEME=${THEME}
 
diff --git a/.drone/deploy.sh b/.drone/deploy.sh
index f98ffc8..31d13a3 100644
--- a/.drone/deploy.sh
+++ b/.drone/deploy.sh
@@ -1,4 +1,5 @@
 export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/ \
+&& echo $NAME \
 && echo "scheme: ${SCHEME}" \
 && docker stack rm ghost \
 && echo 'sleeping...zzz' \
diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index 3e27221..0f6b57f 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -103,7 +103,7 @@ clone:
 
 steps:
 - name: mkdir
-  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+  image: appleboy/drone-ssh:1.6.3
   settings:
     envs:
     - drone_tag
@@ -117,7 +117,7 @@ steps:
     - rm -f /stack/.images/ghost/built/*.*
 
 - name: alpine/git:v2.26.2
-  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+  image: appleboy/drone-ssh:1.6.3
   settings:
     envs:
     - drone_tag
@@ -137,7 +137,7 @@ steps:
     - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/alpine/git:v2.26.2 $${DESTINATION_REGISTRY}/stack/ghost/alpine/git:v2.26.2" >> /stack/.images/ghost/load.sh
 
 - name: ghost:3.14.0
-  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+  image: appleboy/drone-ssh:1.6.3
   settings:
     envs:
     - drone_tag
@@ -157,7 +157,7 @@ steps:
     - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/ghost:3.14.0 $${DESTINATION_REGISTRY}/stack/ghost/ghost:3.14.0" >> /stack/.images/ghost/load.sh
 
 - name: mysql:5.7
-  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+  image: appleboy/drone-ssh:1.6.3
   settings:
     envs:
     - drone_tag
@@ -177,7 +177,7 @@ steps:
     - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/mysql:5.7 $${DESTINATION_REGISTRY}/stack/ghost/mysql:5.7" >> /stack/.images/ghost/load.sh
 
 - name: my-ghost
-  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+  image: appleboy/drone-ssh:1.6.3
   settings:
     envs:
     - drone_tag
@@ -213,7 +213,7 @@ platform:
 
 steps:
 - name: print env
-  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+  image: appleboy/drone-ssh:1.6.3
   settings:
     envs:
     - drone_tag
@@ -324,7 +324,7 @@ steps:
     target: /stack/ghost
 
 - name: deploy
-  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+  image: appleboy/drone-ssh:1.6.3
   settings:
     envs:
     - drone_tag
diff --git a/docker-compose.yml b/docker-compose.yml
index 204d3c1..5e6c6d7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,10 +28,10 @@ services:
       - database__connection__database=ghost
       - database__pool__min=0 # https://github.com/knex/knex/issues/975
     networks:
-      - appnet
       - externalnet
+      - appnet
   ghost-mysql:
-    image: ${LOCAL_DOCKER_REGISTRY}mysql:5.7
+    image: ${DOCKER_REGISTRY}mysql:5.7
     deploy:
       placement:
         constraints: [node.labels.com.sigyl.git-stack-data == yes]
@@ -60,3 +60,4 @@ networks:
   externalnet:
     driver: overlay
     external: true
+    name: externalnet
diff --git a/ghost/Dockerfile b/ghost/Dockerfile
index 0aaeee7..98cb27d 100644
--- a/ghost/Dockerfile
+++ b/ghost/Dockerfile
@@ -1,14 +1,17 @@
-ARG REGISTRY
+
+
+##ARG REGISTRY
 FROM ${REGISTRY}alpine/git:v2.26.2 as git
 
 WORKDIR /themes
 ARG THEME=https://sigyl.com/git/themes/casper.git
 RUN git clone ${THEME}
 
-FROM ${REGISTRY}ghost:3.14.0
+FROM ${REGISTRY}ghost:2-alpine
 # USER root
-RUN apt-get update
-RUN apt-get install -y gettext
+
+RUN apk update
+RUN apk add gettext
 
 COPY config.production.json.template /var/lib/ghost/
 COPY --from=git /themes/ /var/lib/ghost/content/themes/
diff --git a/ghost/run.sh b/ghost/run.sh
index ffd1168..1c82694 100644
--- a/ghost/run.sh
+++ b/ghost/run.sh
@@ -1,3 +1,4 @@
 envsubst < /var/lib/ghost/config.production.json.template > /var/lib/ghost/config.production.json
 envsubst < /hbs/post.hbs > /var/lib/ghost/content/themes/casper/post.hbs
+export DEBUG=*
 node "current/index.js"