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

jsdonnet-drone@0.1.0
continuous-integration/drone/push Build is passing Details
continuous-integration/drone Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-08-28 14:07:09 +01:00
parent eca3827527
commit 5ebeb67915
10 changed files with 213 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.drone/drone-home.jsonnet
View File

@ -3,15 +3,28 @@ local secretSecrets = import 'lib/secret-secrets.libsonnet';
local publicSecrets = import 'lib/public-secrets.libsonnet'; local publicSecrets = import 'lib/public-secrets.libsonnet';
local deploy = import 'node_modules/@sigyl/jsonnet-drone/deploy.libsonnet'; local deploy = import 'node_modules/@sigyl/jsonnet-drone/deploy.libsonnet';
local register = import 'node_modules/@sigyl/jsonnet-drone/register.libsonnet';
[ [
register,
deploy( deploy(
'commento', 'commento',
'/stack/', '/stack/',
[ [],
'LOCAL_DOCKER_REGISTRY',
'REGISTRY_PASSWORD',
],
publicSecrets, publicSecrets,
secretSecrets secretSecrets,
), [
'REGISTRY_DOMAIN',
'REGISTRY_PORT',
'REGISTRY_PASSWORD',
]
) {
trigger +: {
event +: [
'promote',
],
target +: [
'production',
],
},
},
] ]

305
.drone/drone-home.yml
View File

@ -1,3 +1,20 @@
---
kind: pipeline
type: docker
name: register
platform:
os: linux
arch: amd64
clone:
disable: true
trigger:
event:
exclude:
- promote
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
@ -9,7 +26,7 @@ platform:
steps: steps:
- name: print env - name: print env
image: appleboy/drone-ssh:1.6.2 image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
settings: settings:
envs: envs:
- drone_tag - drone_tag
@ -17,118 +34,99 @@ steps:
- drone_build_number - drone_build_number
- drone_repo_name - drone_repo_name
- drone_repo_namespace - drone_repo_namespace
- local_docker_registry - origin
- registry_password - smtp_host
- commento_origin - smtp_port
- commento_smtp_host - smtp_username
- commento_smtp_port - smtp_from_address
- commento_smtp_username - forbid_new_owners
- commento_smtp_from_address - postgres_db
- commento_forbid_new_owners - postgres_user
- commento_postgres_db - github_key
- commento_postgres_user - smtp_password
- commento_github_key - askimet_key
- commento_smtp_password - postgres_password
- commento_askimet_key - github_secret
- commento_postgres_password host: ${SSH_HOST}
- commento_github_secret key: ${SSH_KEY}
host: passphrase: ${SSH_PASSPHRASE}
from_secret: ssh-host port: ${SSH_PORT}
key:
from_secret: ssh-key
port:
from_secret: ssh-port
script: script:
- rm -f env-commento - rm -f env-commento
- "echo \"export LOCAL_DOCKER_REGISTRY='$${LOCAL_DOCKER_REGISTRY}'\" >> env-commento # \"local-docker-registry\"" - "echo \"export ORIGIN='$${ORIGIN}'\" >> env-commento # \"origin\""
- "echo \"export REGISTRY_PASSWORD='$${REGISTRY_PASSWORD}'\" >> env-commento # \"registry-password\"" - "echo \"export SMTP_HOST='$${SMTP_HOST}'\" >> env-commento # \"smtp-host\""
- "echo \"export COMMENTO_ORIGIN='$${COMMENTO_ORIGIN}'\" >> env-commento # \"commento-origin\"" - "echo \"export SMTP_PORT='$${SMTP_PORT}'\" >> env-commento # \"smtp-port\""
- "echo \"export COMMENTO_SMTP_HOST='$${COMMENTO_SMTP_HOST}'\" >> env-commento # \"commento-smtp-host\"" - "echo \"export SMTP_USERNAME='$${SMTP_USERNAME}'\" >> env-commento # \"smtp-username\""
- "echo \"export COMMENTO_SMTP_PORT='$${COMMENTO_SMTP_PORT}'\" >> env-commento # \"commento-smtp-port\"" - "echo \"export SMTP_FROM_ADDRESS='$${SMTP_FROM_ADDRESS}'\" >> env-commento # \"smtp-from-address\""
- "echo \"export COMMENTO_SMTP_USERNAME='$${COMMENTO_SMTP_USERNAME}'\" >> env-commento # \"commento-smtp-username\"" - "echo \"export FORBID_NEW_OWNERS='$${FORBID_NEW_OWNERS}'\" >> env-commento # \"forbid-new-owners\""
- "echo \"export COMMENTO_SMTP_FROM_ADDRESS='$${COMMENTO_SMTP_FROM_ADDRESS}'\" >> env-commento # \"commento-smtp-from-address\"" - "echo \"export POSTGRES_DB='$${POSTGRES_DB}'\" >> env-commento # \"postgres-db\""
- "echo \"export COMMENTO_FORBID_NEW_OWNERS='$${COMMENTO_FORBID_NEW_OWNERS}'\" >> env-commento # \"commento-forbid-new-owners\"" - "echo \"export POSTGRES_USER='$${POSTGRES_USER}'\" >> env-commento # \"postgres-user\""
- "echo \"export COMMENTO_POSTGRES_DB='$${COMMENTO_POSTGRES_DB}'\" >> env-commento # \"commento-postgres-db\"" - "echo \"export GITHUB_KEY='$${GITHUB_KEY}'\" >> env-commento # \"github-key\""
- "echo \"export COMMENTO_POSTGRES_USER='$${COMMENTO_POSTGRES_USER}'\" >> env-commento # \"commento-postgres-user\"" - "echo \"export SMTP_PASSWORD='$${SMTP_PASSWORD}'\" >> env-commento # \"smtp-password\""
- "echo \"export COMMENTO_GITHUB_KEY='$${COMMENTO_GITHUB_KEY}'\" >> env-commento # \"commento-github-key\"" - "echo \"export ASKIMET_KEY='$${ASKIMET_KEY}'\" >> env-commento # \"askimet-key\""
- "echo \"export COMMENTO_SMTP_PASSWORD='$${COMMENTO_SMTP_PASSWORD}'\" >> env-commento # \"commento-smtp-password\"" - "echo \"export POSTGRES_PASSWORD='$${POSTGRES_PASSWORD}'\" >> env-commento # \"postgres-password\""
- "echo \"export COMMENTO_ASKIMET_KEY='$${COMMENTO_ASKIMET_KEY}'\" >> env-commento # \"commento-askimet-key\"" - "echo \"export GITHUB_SECRET='$${GITHUB_SECRET}'\" >> env-commento # \"github-secret\""
- "echo \"export COMMENTO_POSTGRES_PASSWORD='$${COMMENTO_POSTGRES_PASSWORD}'\" >> env-commento # \"commento-postgres-password\"" username: ${SSH_USER}
- "echo \"export COMMENTO_GITHUB_SECRET='$${COMMENTO_GITHUB_SECRET}'\" >> env-commento # \"commento-github-secret\""
username:
from_secret: ssh-user
environment: environment:
COMMENTO_ASKIMET_KEY: ASKIMET_KEY:
from_secret: commento-askimet-key from_secret: askimet-key
COMMENTO_FORBID_NEW_OWNERS: FORBID_NEW_OWNERS:
from_secret: commento-forbid-new-owners from_secret: forbid-new-owners
COMMENTO_GITHUB_KEY: GITHUB_KEY:
from_secret: commento-github-key from_secret: github-key
COMMENTO_GITHUB_SECRET: GITHUB_SECRET:
from_secret: commento-github-secret from_secret: github-secret
COMMENTO_ORIGIN: ORIGIN:
from_secret: commento-origin from_secret: origin
COMMENTO_POSTGRES_DB: POSTGRES_DB:
from_secret: commento-postgres-db from_secret: postgres-db
COMMENTO_POSTGRES_PASSWORD: POSTGRES_PASSWORD:
from_secret: commento-postgres-password from_secret: postgres-password
COMMENTO_POSTGRES_USER: POSTGRES_USER:
from_secret: commento-postgres-user from_secret: postgres-user
COMMENTO_SMTP_FROM_ADDRESS: SMTP_FROM_ADDRESS:
from_secret: commento-smtp-from-address from_secret: smtp-from-address
COMMENTO_SMTP_HOST: SMTP_HOST:
from_secret: commento-smtp-host from_secret: smtp-host
COMMENTO_SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: commento-smtp-password from_secret: smtp-password
COMMENTO_SMTP_PORT: SMTP_PORT:
from_secret: commento-smtp-port from_secret: smtp-port
COMMENTO_SMTP_USERNAME: SMTP_USERNAME:
from_secret: commento-smtp-username from_secret: smtp-username
LOCAL_DOCKER_REGISTRY:
from_secret: local-docker-registry
REGISTRY_PASSWORD:
from_secret: registry-password
- name: scp - name: scp
image: appleboy/drone-scp:1.6.2 image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
settings: settings:
command_timeout: 2m command_timeout: 2m
host: host: ${SSH_HOST}
from_secret: ssh-host key: ${SSH_KEY}
key: passphrase: ${SSH_PASSPHRASE}
from_secret: ssh-key port: ${SSH_PORT}
port:
from_secret: ssh-port
source: source:
- . - .
target: /stack/commento target: /stack/commento
username: username: ${SSH_USER}
from_secret: ssh-user
- name: wait - name: wait
image: alpine image: alpine:3.12.0@sha256:90baa0922fe90624b05cb5766fa5da4e337921656c2f8e2b13bd3c052a0baac1
commands: commands:
- sleep 15 - sleep 15
- name: "dockerbuild:" - name: "dockerbuild:"
image: docker:dind image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
commands: commands:
- set -e - set -e
- sh .drone/login.sh - sh .drone/login.sh
- sh .drone/build.sh - sh .drone/build.sh
- sh .drone/push.sh - sh .drone/push.sh
- sh .drone/logout.sh - sh .drone/logout.sh
environment:
LOCAL_DOCKER_REGISTRY:
from_secret: local-docker-registry
REGISTRY_PASSWORD:
from_secret: registry-password
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
- name: deploy - name: deploy
image: appleboy/drone-ssh:1.6.2 image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
settings: settings:
envs: envs:
- drone_tag - drone_tag
@ -136,85 +134,80 @@ steps:
- drone_build_number - drone_build_number
- drone_repo_name - drone_repo_name
- drone_repo_namespace - drone_repo_namespace
- commento_origin - registry_domain
- commento_smtp_host - registry_port
- commento_smtp_port
- commento_smtp_username
- commento_smtp_from_address
- commento_forbid_new_owners
- commento_postgres_db
- commento_postgres_user
- commento_github_key
- commento_smtp_password
- commento_askimet_key
- commento_postgres_password
- commento_github_secret
- local_docker_registry
- registry_password - registry_password
host: - origin
from_secret: ssh-host - smtp_host
key: - smtp_port
from_secret: ssh-key - smtp_username
port: - smtp_from_address
from_secret: ssh-port - forbid_new_owners
- postgres_db
- postgres_user
- github_key
- smtp_password
- askimet_key
- postgres_password
- github_secret
host: ${SSH_HOST}
key: ${SSH_KEY}
passphrase: ${SSH_PASSPHRASE}
port: ${SSH_PORT}
script: script:
- export COMMENTO_SMTP_PASSWORD=$${COMMENTO_SMTP_PASSWORD} - export SMTP_PASSWORD=$${SMTP_PASSWORD}
- export COMMENTO_ASKIMET_KEY=$${COMMENTO_ASKIMET_KEY} - export ASKIMET_KEY=$${ASKIMET_KEY}
- export COMMENTO_POSTGRES_PASSWORD=$${COMMENTO_POSTGRES_PASSWORD} - export POSTGRES_PASSWORD=$${POSTGRES_PASSWORD}
- export COMMENTO_GITHUB_SECRET=$${COMMENTO_GITHUB_SECRET} - export GITHUB_SECRET=$${GITHUB_SECRET}
- export COMMENTO_ORIGIN=$${COMMENTO_ORIGIN} - export ORIGIN=$${ORIGIN}
- export COMMENTO_SMTP_HOST=$${COMMENTO_SMTP_HOST} - export SMTP_HOST=$${SMTP_HOST}
- export COMMENTO_SMTP_PORT=$${COMMENTO_SMTP_PORT} - export SMTP_PORT=$${SMTP_PORT}
- export COMMENTO_SMTP_USERNAME=$${COMMENTO_SMTP_USERNAME} - export SMTP_USERNAME=$${SMTP_USERNAME}
- export COMMENTO_SMTP_FROM_ADDRESS=$${COMMENTO_SMTP_FROM_ADDRESS} - export SMTP_FROM_ADDRESS=$${SMTP_FROM_ADDRESS}
- export COMMENTO_FORBID_NEW_OWNERS=$${COMMENTO_FORBID_NEW_OWNERS} - export FORBID_NEW_OWNERS=$${FORBID_NEW_OWNERS}
- export COMMENTO_POSTGRES_DB=$${COMMENTO_POSTGRES_DB} - export POSTGRES_DB=$${POSTGRES_DB}
- export COMMENTO_POSTGRES_USER=$${COMMENTO_POSTGRES_USER} - export POSTGRES_USER=$${POSTGRES_USER}
- export COMMENTO_GITHUB_KEY=$${COMMENTO_GITHUB_KEY} - export GITHUB_KEY=$${GITHUB_KEY}
- export LOCAL_DOCKER_REGISTRY=$${LOCAL_DOCKER_REGISTRY} - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
- export REGISTRY_PORT=$${REGISTRY_PORT}
- export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD} - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}
- set -e - set -e
- cd /stack/commento - cd /stack/commento
- sh .drone/login.sh - sh .drone/login.sh
- sh .drone/pull.sh - sh .drone/pull.sh
- sh .drone/deploy.sh - sh .drone/deploy.sh
username: username: ${SSH_USER}
from_secret: ssh-user
environment: environment:
COMMENTO_ASKIMET_KEY: ASKIMET_KEY:
from_secret: commento-askimet-key from_secret: askimet-key
COMMENTO_FORBID_NEW_OWNERS: FORBID_NEW_OWNERS:
from_secret: commento-forbid-new-owners from_secret: forbid-new-owners
COMMENTO_GITHUB_KEY: GITHUB_KEY:
from_secret: commento-github-key from_secret: github-key
COMMENTO_GITHUB_SECRET: GITHUB_SECRET:
from_secret: commento-github-secret from_secret: github-secret
COMMENTO_ORIGIN: ORIGIN:
from_secret: commento-origin from_secret: origin
COMMENTO_POSTGRES_DB: POSTGRES_DB:
from_secret: commento-postgres-db from_secret: postgres-db
COMMENTO_POSTGRES_PASSWORD: POSTGRES_PASSWORD:
from_secret: commento-postgres-password from_secret: postgres-password
COMMENTO_POSTGRES_USER: POSTGRES_USER:
from_secret: commento-postgres-user from_secret: postgres-user
COMMENTO_SMTP_FROM_ADDRESS: SMTP_FROM_ADDRESS:
from_secret: commento-smtp-from-address from_secret: smtp-from-address
COMMENTO_SMTP_HOST: SMTP_HOST:
from_secret: commento-smtp-host from_secret: smtp-host
COMMENTO_SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: commento-smtp-password from_secret: smtp-password
COMMENTO_SMTP_PORT: SMTP_PORT:
from_secret: commento-smtp-port from_secret: smtp-port
COMMENTO_SMTP_USERNAME: SMTP_USERNAME:
from_secret: commento-smtp-username from_secret: smtp-username
LOCAL_DOCKER_REGISTRY:
from_secret: local-docker-registry
REGISTRY_PASSWORD:
from_secret: registry-password
services: services:
- name: docker - name: docker
image: docker:dind image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
privileged: true privileged: true
volumes: volumes:
- name: dockersock - name: dockersock
@ -229,4 +222,10 @@ volumes:
host: host:
path: /etc/docker/certs.d path: /etc/docker/certs.d
trigger:
event:
- promote
target:
- production
... ...

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

@ -1,11 +1,11 @@
[ [
'commento-origin', 'origin',
'commento-smtp-host', 'smtp-host',
'commento-smtp-port', 'smtp-port',
'commento-smtp-username', 'smtp-username',
'commento-smtp-from-address', 'smtp-from-address',
'commento-forbid-new-owners', 'forbid-new-owners',
'commento-postgres-db', 'postgres-db',
'commento-postgres-user', 'postgres-user',
'commento-github-key', 'github-key',
] ]

8
.drone/lib/secret-secrets.libsonnet
View File

@ -1,6 +1,6 @@
[ [
'commento-smtp-password', 'smtp-password',
'commento-askimet-key', 'askimet-key',
'commento-postgres-password', 'postgres-password',
'commento-github-secret', 'github-secret',
] ]

2
.drone/login.sh
View File

@ -1 +1 @@
docker login ${LOCAL_DOCKER_REGISTRY} --username client --password "${REGISTRY_PASSWORD}" docker login ${REGISTRY_DOMAIN}:${REGISTRY_PORT} --username client --password "${REGISTRY_PASSWORD}"

2
.drone/logout.sh
View File

@ -1 +1 @@
docker logout ${LOCAL_DOCKER_REGISTRY} docker logout ${REGISTRY_DOMAIN}:${REGISTRY_PORT}

2
.drone/package.json
View File

@ -4,6 +4,6 @@
"build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream" "build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream"
}, },
"dependencies": { "dependencies": {
"@sigyl/jsonnet-drone": "^0.0.7" "@sigyl/jsonnet-drone": "^0.1.0"
} }
} }

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" 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.0.7": "@sigyl/jsonnet-drone@^0.1.0":
version "0.0.7" version "0.1.0"
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.0.7.tgz#0f92ef15096b0c5497741ff56bfbd249de9edd66" resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.1.0.tgz#feda1797e8e9ef799cad72e65f7163ca26a9e3a5"
integrity sha512-353n/zExNnKPPZ235eLX3/DFXJVNIX8fdAeG3RvY+55538eGzDIk0/3HJd8jXsD6y0zxm+LexW5HghvXBMBOEA== integrity sha512-QY/ngucxFOtLfL8Mt0f2bxN4fQDUOGOFtaRpSH2cNyg84xADkzehT0ORZtbLitr+AwhyF5KN/zAGvzkyNAoqPw==
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"

18
README.md
View File

@ -1,12 +1,12 @@
# commento # commento
## secrets ## secrets
* commento-github-key
* commento-github-secret * github-key
* commento-origin * github-secret
* commento-postgres-password * origin
* commento-smtp-from-address * postgres-password
* commento-smtp-host * smtp-from-address
* commento-smtp-port * smtp-host
* commento-smtp-username * smtp-port
* registry-password * smtp-username

26
docker-compose.yml
View File

@ -9,18 +9,18 @@ services:
condition: any condition: any
image: registry.gitlab.com/commento/commento:latest image: registry.gitlab.com/commento/commento:latest
environment: environment:
COMMENTO_ORIGIN: $COMMENTO_ORIGIN ORIGIN: $ORIGIN
COMMENTO_SMTP_PASSWORD: $COMMENTO_SMTP_PASSWORD SMTP_PASSWORD: $SMTP_PASSWORD
COMMENTO_ASKIMET_KEY: $COMMENTO_ASKIMET_KEY ASKIMET_KEY: $ASKIMET_KEY
COMMENTO_SMTP_HOST: $COMMENTO_SMTP_HOST SMTP_HOST: $SMTP_HOST
COMMENTO_SMTP_PORT: $COMMENTO_SMTP_PORT SMTP_PORT: $SMTP_PORT
COMMENTO_SMTP_USERNAME: $COMMENTO_SMTP_USERNAME SMTP_USERNAME: $SMTP_USERNAME
COMMENTO_SMTP_FROM_ADDRESS: $COMMENTO_SMTP_FROM_ADDRESS SMTP_FROM_ADDRESS: $SMTP_FROM_ADDRESS
COMMENTO_GITHUB_KEY: $COMMENTO_GITHUB_KEY GITHUB_KEY: $GITHUB_KEY
COMMENTO_GITHUB_SECRET: $COMMENTO_GITHUB_SECRET GITHUB_SECRET: $GITHUB_SECRET
COMMENTO_FORBID_NEW_OWNERS: $COMMENTO_FORBID_NEW_OWNERS FORBID_NEW_OWNERS: $FORBID_NEW_OWNERS
COMMENTO_PORT: 8080 PORT: 8080
COMMENTO_POSTGRES: postgres://commento:${COMMENTO_POSTGRES_PASSWORD}@commento-postgres:5432/commento?sslmode=disable POSTGRES: postgres://commento:${POSTGRES_PASSWORD}@commento-postgres:5432/commento?sslmode=disable
networks: networks:
- appnet - appnet
- externalnet - externalnet
@ -35,7 +35,7 @@ services:
environment: environment:
POSTGRES_DB: commento POSTGRES_DB: commento
POSTGRES_USER: commento POSTGRES_USER: commento
POSTGRES_PASSWORD: ${COMMENTO_POSTGRES_PASSWORD} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
networks: networks:
- appnet - appnet
volumes: volumes: