records mail password on print

2023-10-19 14:26:13 +00:00
8 changed files with 37 additions and 54 deletions
--- a/.drone/build.sh
+++ b/.drone/build.sh
@ -1,5 +1,3 @@
-sleep 10
-
 docker build ghost -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/my-ghost \
  --build-arg REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/ \
  --build-arg THEME=${THEME}
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@ -128,13 +128,12 @@ steps:
    - registry_domain
    - registry_port
    - registry_password
-    - destination_registry
    script:
    - "n=0\nwhile :\ndo\n  docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n    && break  # substitute your command here\n  n=$((n+1))\n      if [ $n -ge 10 ]; then\n      echo \"login failed\"\n      exit 1\n  fi\n  echo \"retrying login..$n\"\n  sleep 5\ndone\n"
    - docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/alpine/git:v2.26.2
    - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/alpine/git:v2.26.2 -o /stack/.images/ghost/alpine_git:v2.26.2.tar
-    - echo "docker load < alpine_git:v2.26.2.tar" >> /stack/.images/ghost/load.sh
-    - 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
+    - echo "docker load alpine_git:v2.26.2.tar" >> /stack/.images/ghost/load.sh
+    - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/alpine/git:v2.26.2 /stack/DOLLAR1/alpine/git:v2.26.2" >> /stack/.images/ghost/load.sh

 - name: ghost:3.14.0
  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
@ -148,13 +147,12 @@ steps:
    - registry_domain
    - registry_port
    - registry_password
-    - destination_registry
    script:
    - "n=0\nwhile :\ndo\n  docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n    && break  # substitute your command here\n  n=$((n+1))\n      if [ $n -ge 10 ]; then\n      echo \"login failed\"\n      exit 1\n  fi\n  echo \"retrying login..$n\"\n  sleep 5\ndone\n"
    - docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/ghost:3.14.0
    - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/ghost:3.14.0 -o /stack/.images/ghost/ghost:3.14.0.tar
-    - echo "docker load < ghost:3.14.0.tar" >> /stack/.images/ghost/load.sh
-    - 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
+    - echo "docker load ghost:3.14.0.tar" >> /stack/.images/ghost/load.sh
+    - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/ghost:3.14.0 /stack/DOLLAR1/ghost:3.14.0" >> /stack/.images/ghost/load.sh

 - name: mysql:5.7
  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
@ -168,13 +166,12 @@ steps:
    - registry_domain
    - registry_port
    - registry_password
-    - destination_registry
    script:
    - "n=0\nwhile :\ndo\n  docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n    && break  # substitute your command here\n  n=$((n+1))\n      if [ $n -ge 10 ]; then\n      echo \"login failed\"\n      exit 1\n  fi\n  echo \"retrying login..$n\"\n  sleep 5\ndone\n"
    - docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/mysql:5.7
    - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/mysql:5.7 -o /stack/.images/ghost/mysql:5.7.tar
-    - echo "docker load < mysql:5.7.tar" >> /stack/.images/ghost/load.sh
-    - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/mysql:5.7 $${DESTINATION_REGISTRY}/stack/ghost/mysql:5.7" >> /stack/.images/ghost/load.sh
+    - echo "docker load mysql:5.7.tar" >> /stack/.images/ghost/load.sh
+    - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/mysql:5.7 /stack/DOLLAR1/mysql:5.7" >> /stack/.images/ghost/load.sh

 - name: my-ghost
  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
@ -188,13 +185,12 @@ steps:
    - registry_domain
    - registry_port
    - registry_password
-    - destination_registry
    script:
    - "n=0\nwhile :\ndo\n  docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n    && break  # substitute your command here\n  n=$((n+1))\n      if [ $n -ge 10 ]; then\n      echo \"login failed\"\n      exit 1\n  fi\n  echo \"retrying login..$n\"\n  sleep 5\ndone\n"
    - docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/my-ghost
    - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/my-ghost -o /stack/.images/ghost/built/my-ghost.tar
    - echo "docker load my-ghost.tar" >> /stack/.images/ghost/built/load.sh
-    - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/my-ghost ${DESINATION_REGISTRY}/stack/ghost/my-ghost" >> /stack/.images/ghost/built/load.sh
+    - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/ghost/my-ghost /stack/DOLLAR1/my-ghost" >> /stack/.images/ghost/built/load.sh

 trigger:
  event:
@ -221,25 +217,32 @@ steps:
    - drone_build_number
    - drone_repo_name
    - drone_repo_namespace
-    - mail
+    - mail_service
+    - mail_user
    - commento_origin
    - theme
    - mysql_root_password
    script:
    - rm -f env-ghost
-    - "echo \"export MAIL='$${MAIL}'\" >> env-ghost # \"mail\""
+    - "echo \"export MAIL_SERVICE='$${MAIL_SERVICE}'\" >> env-ghost # \"mail-service\""
+    - "echo \"export MAIL_USER='$${MAIL_USER}'\" >> env-ghost # \"mail-user\""
+    - "echo \"export MAIL_PASSWORD='$${MAIL_PASSWORD}'\" >> env-ghost # \"mail-password\""
    - "echo \"export COMMENTO_ORIGIN='$${COMMENTO_ORIGIN}'\" >> env-ghost # \"commento-origin\""
    - "echo \"export THEME='$${THEME}'\" >> env-ghost # \"theme\""
    - "echo \"export MYSQL_ROOT_PASSWORD='$${MYSQL_ROOT_PASSWORD}'\" >> env-ghost # \"mysql-root-password\""
  environment:
    COMMENTO_ORIGIN:
      from_secret: commento-origin
-    MAIL:
-      from_secret: mail
+    MAIL_SERVICE:
+      from_secret: mail-service
+    MAIL_USER:
+      from_secret: mail-user
    MYSQL_ROOT_PASSWORD:
      from_secret: mysql-root-password
    THEME:
      from_secret: theme
+    MAIL_PASSWORD:
+      from_secret: mail-password

 trigger:
  event:
@ -333,16 +336,19 @@ steps:
    - registry_domain
    - registry_port
    - registry_password
-    - mail
+    - mail_service
+    - mail_user
    - commento_origin
    - theme
    - mysql_root_password
    - theme
    script:
    - export MYSQL_ROOT_PASSWORD=$${MYSQL_ROOT_PASSWORD}
-    - export MAIL=$${MAIL}
+    - export MAIL_SERVICE=$${MAIL_SERVICE}
+    - export MAIL_USER=$${MAIL_USER}
    - export COMMENTO_ORIGIN=$${COMMENTO_ORIGIN}
    - export THEME=$${THEME}
+    - export THEME=$${THEME}
    - export SCHEME=$${SCHEME}
    - export DOMAIN=$${DOMAIN}
    - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
@ -358,8 +364,10 @@ steps:
  environment:
    COMMENTO_ORIGIN:
      from_secret: commento-origin
-    MAIL:
-      from_secret: mail
+    MAIL_SERVICE:
+      from_secret: mail-service
+    MAIL_USER:
+      from_secret: mail-user
    MYSQL_ROOT_PASSWORD:
      from_secret: mysql-root-password
    THEME:
--- a/.drone/package.json
+++ b/.drone/package.json
@ -1,6 +1,6 @@
 {
  "private": true,
  "dependencies": {
-    "@sigyl/jsonnet-drone": "^1.0.0"
+    "@sigyl/jsonnet-drone": "^0.4.5"
  }
 }
--- 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@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-1.0.0.tgz#943bd8a1abc8a916026944816709f5ed1d8e7ef8"
-  integrity sha512-ubyVC1/nAM584wTnnRBZTOP18z28Yy7SRApvSuo/3y2arngKlNI1FwOzKTFt/7L9+rNy19dRO/g0obEkyR3KmA==
+"@sigyl/jsonnet-drone@^0.4.5":
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.5.tgz#deb45b3fa837650d518b651044e993266c7386ac"
+  integrity sha512-s7/QHlT4YydwDPz/puR4iy7rcTl5vqR4YQmqlXCMA7VlcYPT4tC3GOb38njwZfNN4mxNa6oDKaM6eZEJX4SpiQ==
  dependencies:
    "@sigyl/jsonnet-compose" "^0.0.2"
    "@sigyl/jsonnet-drone-environment" "0.0.5"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -16,11 +16,12 @@ services:
      - ghost-content-data:/var/lib/ghost/content/data
      - ghost-content-logs:/var/lib/ghost/content/logs
    environment:
-      - NODE_ENV=production
      - DOMAIN=$DOMAIN
      - SCHEME=$SCHEME
+      - MAIL-SERVICE=$MAIL-SERVICE
+      - MAIL-USER=$MAIL-USER
+      - MAIL-PASSWORD=$MAIL-PASSWORD
      - COMMENTO_ORIGIN=$COMMENTO_ORIGIN
-      - MAIL=$MAIL
      - database__client=mysql
      - database__connection__host=ghost-mysql
      - database__connection__user=root
--- a/ghost/Dockerfile
+++ b/ghost/Dockerfile
@ -10,7 +10,7 @@ FROM ${REGISTRY}ghost:3.14.0
 RUN apt-get update
 RUN apt-get install -y gettext

-COPY config.production.json.template /var/lib/ghost/
+COPY config.production.json /var/lib/ghost/
 COPY --from=git /themes/ /var/lib/ghost/content/themes/
 COPY post.hbs /hbs/
 COPY run.sh /
--- a/ghost/config.production.json.template
+++ b/ghost/config.production.json.template
@ -1,24 +0,0 @@
-{
-  "url": "${SCHEME}://${DOMAIN}/",
-  "server": {
-    "port": 2368,
-    "host": "0.0.0.0"
-  },
-  "database": {
-    "client": "sqlite3",
-    "connection": {
-      "filename": "/var/lib/ghost/content/data/ghost.db"
-    }
-  },
-  "mail": ${MAIL},
-  "logging": {
-    "transports": [
-      "file",
-      "stdout"
-    ]
-  },
-  "process": "systemd",
-  "paths": {
-    "contentPath": "/var/lib/ghost/content"
-  }
-}
--- a/ghost/run.sh
+++ b/ghost/run.sh
@ -1,3 +1,3 @@
-envsubst < /var/lib/ghost/config.production.json.template > /var/lib/ghost/config.production.json
+envsubst < /var/lib/ghost/config.production.json > __tmp && mv __tmp /var/lib/ghost/config.production.json
 envsubst < /hbs/post.hbs > /var/lib/ghost/content/themes/casper/post.hbs
 node "current/index.js"