Compare commits

...

14 Commits

Author SHA1 Message Date
Giles Bradshaw 40ead1a3b1 .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone Build is passing Details
2020-08-28 14:38:12 +01:00
Giles Bradshaw 6990241773 .
continuous-integration/drone/push Build is passing Details
2020-08-28 14:34:18 +01:00
Giles Bradshaw 5ebeb67915 jsdonnet-drone@0.1.0
continuous-integration/drone/push Build is passing Details
continuous-integration/drone Build is passing Details
2020-08-28 14:07:09 +01:00
Giles eca3827527 fix: use drone jsonnet 0.0.7
continuous-integration/drone/push Build is passing Details
2020-08-20 11:13:17 +01:00
Giles 79e6734660 fix: use 0.0.6 of jsonnet-drone
continuous-integration/drone/push Build is failing Details
2020-08-20 11:00:51 +01:00
Giles 2b05a2f78f empty
continuous-integration/drone/push Build is failing Details
2020-08-20 10:40:49 +01:00
Giles a5d559c217 chore(release): 0.0.5
continuous-integration/drone/push Build is passing Details
2020-08-20 00:04:34 +01:00
Giles a677b57f29 ci: logins 2020-08-20 00:04:20 +01:00
Giles 8db95143cf chore(release): 0.0.4
continuous-integration/drone/push Build is passing Details
2020-08-19 23:57:35 +01:00
Giles 7c8230c116 ci: moved scripts 2020-08-19 23:57:15 +01:00
Giles 31294210c1 chore(release): 0.0.3
continuous-integration/drone/push Build is passing Details
2020-08-19 23:26:19 +01:00
Giles dfbfe4938a ci: built from library 2020-08-19 23:25:57 +01:00
Giles 52d9d66e2b chore(release): 0.0.2 2020-08-19 23:18:36 +01:00
Giles b8480a5235 ci built with library 2020-08-19 23:18:06 +01:00
18 changed files with 349 additions and 22 deletions

1
.drone/build.sh Normal file
View File

@ -0,0 +1 @@
echo 'nothing to build'

30
.drone/drone-home.jsonnet Normal file
View File

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

231
.drone/drone-home.yml Normal file
View File

@ -0,0 +1,231 @@
---
kind: pipeline
type: docker
name: register
platform:
os: linux
arch: amd64
clone:
disable: true
trigger:
event:
exclude:
- promote
---
kind: pipeline
type: docker
name: deploy
platform:
os: linux
arch: amd64
steps:
- name: print env
image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
settings:
envs:
- drone_tag
- drone_commit
- drone_build_number
- drone_repo_name
- drone_repo_namespace
- origin
- smtp_host
- smtp_port
- smtp_username
- smtp_from_address
- 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:
- rm -f env-commento
- "echo \"export ORIGIN='$${ORIGIN}'\" >> env-commento # \"origin\""
- "echo \"export SMTP_HOST='$${SMTP_HOST}'\" >> env-commento # \"smtp-host\""
- "echo \"export SMTP_PORT='$${SMTP_PORT}'\" >> env-commento # \"smtp-port\""
- "echo \"export SMTP_USERNAME='$${SMTP_USERNAME}'\" >> env-commento # \"smtp-username\""
- "echo \"export SMTP_FROM_ADDRESS='$${SMTP_FROM_ADDRESS}'\" >> env-commento # \"smtp-from-address\""
- "echo \"export FORBID_NEW_OWNERS='$${FORBID_NEW_OWNERS}'\" >> env-commento # \"forbid-new-owners\""
- "echo \"export POSTGRES_DB='$${POSTGRES_DB}'\" >> env-commento # \"postgres-db\""
- "echo \"export POSTGRES_USER='$${POSTGRES_USER}'\" >> env-commento # \"postgres-user\""
- "echo \"export GITHUB_KEY='$${GITHUB_KEY}'\" >> env-commento # \"github-key\""
- "echo \"export SMTP_PASSWORD='$${SMTP_PASSWORD}'\" >> env-commento # \"smtp-password\""
- "echo \"export ASKIMET_KEY='$${ASKIMET_KEY}'\" >> env-commento # \"askimet-key\""
- "echo \"export POSTGRES_PASSWORD='$${POSTGRES_PASSWORD}'\" >> env-commento # \"postgres-password\""
- "echo \"export GITHUB_SECRET='$${GITHUB_SECRET}'\" >> env-commento # \"github-secret\""
username: ${SSH_USER}
environment:
ASKIMET_KEY:
from_secret: askimet-key
FORBID_NEW_OWNERS:
from_secret: forbid-new-owners
GITHUB_KEY:
from_secret: github-key
GITHUB_SECRET:
from_secret: github-secret
ORIGIN:
from_secret: origin
POSTGRES_DB:
from_secret: postgres-db
POSTGRES_PASSWORD:
from_secret: postgres-password
POSTGRES_USER:
from_secret: postgres-user
SMTP_FROM_ADDRESS:
from_secret: smtp-from-address
SMTP_HOST:
from_secret: smtp-host
SMTP_PASSWORD:
from_secret: smtp-password
SMTP_PORT:
from_secret: smtp-port
SMTP_USERNAME:
from_secret: smtp-username
- name: scp
image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
settings:
command_timeout: 2m
host: ${SSH_HOST}
key: ${SSH_KEY}
passphrase: ${SSH_PASSPHRASE}
port: ${SSH_PORT}
source:
- .
target: /stack/commento
username: ${SSH_USER}
- name: wait
image: alpine:3.12.0@sha256:90baa0922fe90624b05cb5766fa5da4e337921656c2f8e2b13bd3c052a0baac1
commands:
- sleep 15
- name: "dockerbuild:"
image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
commands:
- set -e
- sh .drone/login.sh
- sh .drone/build.sh
- sh .drone/push.sh
- sh .drone/logout.sh
volumes:
- name: dockersock
path: /var/run
- name: deploy
image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
settings:
envs:
- drone_tag
- drone_commit
- drone_build_number
- drone_repo_name
- drone_repo_namespace
- registry_domain
- registry_port
- registry_password
- origin
- smtp_host
- smtp_port
- smtp_username
- smtp_from_address
- 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:
- export SMTP_PASSWORD=$${SMTP_PASSWORD}
- export ASKIMET_KEY=$${ASKIMET_KEY}
- export POSTGRES_PASSWORD=$${POSTGRES_PASSWORD}
- export GITHUB_SECRET=$${GITHUB_SECRET}
- export ORIGIN=$${ORIGIN}
- export SMTP_HOST=$${SMTP_HOST}
- export SMTP_PORT=$${SMTP_PORT}
- export SMTP_USERNAME=$${SMTP_USERNAME}
- export SMTP_FROM_ADDRESS=$${SMTP_FROM_ADDRESS}
- export FORBID_NEW_OWNERS=$${FORBID_NEW_OWNERS}
- export POSTGRES_DB=$${POSTGRES_DB}
- export POSTGRES_USER=$${POSTGRES_USER}
- export GITHUB_KEY=$${GITHUB_KEY}
- export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
- export REGISTRY_PORT=$${REGISTRY_PORT}
- export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}
- set -e
- cd /stack/commento
- sh .drone/login.sh
- sh .drone/pull.sh
- sh .drone/deploy.sh
username: ${SSH_USER}
environment:
ASKIMET_KEY:
from_secret: askimet-key
FORBID_NEW_OWNERS:
from_secret: forbid-new-owners
GITHUB_KEY:
from_secret: github-key
GITHUB_SECRET:
from_secret: github-secret
ORIGIN:
from_secret: origin
POSTGRES_DB:
from_secret: postgres-db
POSTGRES_PASSWORD:
from_secret: postgres-password
POSTGRES_USER:
from_secret: postgres-user
SMTP_FROM_ADDRESS:
from_secret: smtp-from-address
SMTP_HOST:
from_secret: smtp-host
SMTP_PASSWORD:
from_secret: smtp-password
SMTP_PORT:
from_secret: smtp-port
SMTP_USERNAME:
from_secret: smtp-username
services:
- name: docker
image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
privileged: true
volumes:
- name: dockersock
path: /var/run
- name: ca
path: /etc/docker/certs.d
volumes:
- name: dockersock
temp: {}
- name: ca
host:
path: /etc/docker/certs.d
trigger:
event:
- promote
target:
- production
...

View File

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

View File

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

1
.drone/login.sh Normal file
View File

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

1
.drone/logout.sh Normal file
View File

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

9
.drone/package.json Normal file
View File

@ -0,0 +1,9 @@
{
"private": true,
"scripts": {
"build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream"
},
"dependencies": {
"@sigyl/jsonnet-drone": "^0.1.0"
}
}

1
.drone/pull.sh Normal file
View File

@ -0,0 +1 @@
echo 'nothing to pull'

1
.drone/push.sh Normal file
View File

@ -0,0 +1 @@
echo 'nothing to push'

21
.drone/yarn.lock Normal file
View File

@ -0,0 +1,21 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
"@sigyl/jsonnet-compose@^0.0.2":
version "0.0.2"
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-compose/-/jsonnet-compose-0.0.2.tgz#8900a21e8cd8109929b6042703f8645aacb9bcda"
integrity sha512-wWS3CgPeNi/o1pcS6n/4pafxlMD0KC9/RKMZr/ySmzeGNRW++sPuKuxajYse2TNd47uNDdeUSnk4aEeEIKL0zA==
"@sigyl/jsonnet-drone-environment@0.0.5":
version "0.0.5"
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.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.1.0.tgz#feda1797e8e9ef799cad72e65f7163ca26a9e3a5"
integrity sha512-QY/ngucxFOtLfL8Mt0f2bxN4fQDUOGOFtaRpSH2cNyg84xADkzehT0ORZtbLitr+AwhyF5KN/zAGvzkyNAoqPw==
dependencies:
"@sigyl/jsonnet-compose" "^0.0.2"
"@sigyl/jsonnet-drone-environment" "0.0.5"

3
.versionrc copy Normal file
View File

@ -0,0 +1,3 @@
{
"tagMessageInChangeLog": true
}

View File

@ -2,4 +2,12 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [0.0.5](https://sigyl.com///compare/v0.0.4...v0.0.5) "chore(release): 0.0.5" (2020-08-19)
### [0.0.4](https://sigyl.com///compare/v0.0.3...v0.0.4) "chore(release): 0.0.4" (2020-08-19)
### [0.0.3](https://sigyl.com///compare/v0.0.2...v0.0.3) "chore(release): 0.0.3" (2020-08-19)
### [0.0.2](https://sigyl.com///compare/v0.0.1...v0.0.2) "chore(release): 0.0.2" (2020-08-19)
### 0.0.1 "initial release" (2020-08-11)

View File

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

View File

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

3
git-hooks/pre-commit Executable file
View File

@ -0,0 +1,3 @@
drone jsonnet --source .drone/drone-home.jsonnet --target .drone/drone-home.yml --stream \
&& git add .drone/drone-home.yml \
&& echo "jsonnet built"

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "commento",
"version": "0.0.1",
"version": "0.0.5",
"description": "commento",
"scripts": {
"deploy": "sh deploy.sh",