flywithu/rancher_community-catalog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made changes related to @rawmind0's code review

Browse Source
This commit is contained in:
Zicklag 2018-01-31 14:51:44 -06:00
parent 625adadd9a
commit 32d80f0ade
2 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
templates/huginn/0/docker-compose.yml
View File

@ -3,110 +3,106 @@ version: '2'
services: services:
postgres: postgres:
image: postgres:9.5 image: postgres:9.5
restart: always
volumes: volumes:
- postgres-data:/var/lib/postgresql/data - postgres-data:/var/lib/postgresql/data
environment: environment:
POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_PASSWORD: ${DB_PASSWORD}
POSTGRES_USER: huginn POSTGRES_USER: ${DB_USER}
POSTGRES_DB: huginn POSTGRES_DB: ${DB_NAME}
http_proxy: http_proxy:
https_proxy: https_proxy:
labels:
io.rancher.container.pull_image: always
huginn-web: huginn-web:
image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a
restart: always restart: always
external_links:
- postgres: postgres
environment: environment:
DATABASE_ADAPTER: postgresql DATABASE_ADAPTER: postgresql
POSTGRES_PORT_5432_TCP_ADDR: postgres POSTGRES_PORT_5432_TCP_ADDR: postgres
POSTGRES_PORT_5432_TCP_PORT: 5432 POSTGRES_PORT_5432_TCP_PORT: 5432
DATABASE_ADAPTER: postgresql DATABASE_NAME: ${DB_NAME}
DATABASE_NAME: huginn DATABASE_USERNAME: ${DB_USER}
DATABASE_USERNAME: huginn
DATABASE_PASSWORD: ${DB_PASSWORD} DATABASE_PASSWORD: ${DB_PASSWORD}
APP_SECRET_TOKEN: ${APP_SECRET_TOKEN} APP_SECRET_TOKEN: ${APP_SECRET_TOKEN}
DOMAIN: $DOMAIN DOMAIN: ${DOMAIN}
INVITATION_CODE: $INVITATION_CODE INVITATION_CODE: ${INVITATION_CODE}
SKIP_INVITATION_CODE: $SKIP_INVITATION_CODE SKIP_INVITATION_CODE: ${SKIP_INVITATION_CODE}
REQUIRE_CONFIRMED_EMAIL: true REQUIRE_CONFIRMED_EMAIL: ${REQUIRE_CONFIRMED_EMAIL}
SMTP_DOMAIN: $DOMAIN SMTP_DOMAIN: ${DOMAIN}
SMTP_USER_NAME: $SMTP_USER_NAME SMTP_USER_NAME: ${SMTP_USER_NAME}
SMTP_PASSWORD: $SMTP_PASSWORD SMTP_PASSWORD: ${SMTP_PASSWORD}
SMTP_SERVER: $SMTP_SERVER SMTP_SERVER: ${SMTP_SERVER}
SMTP_PORT: $SMTP_PORT SMTP_PORT: ${SMTP_PORT}
SMTP_AUTHENTICATION: $SMTP_AUTHENTICATION SMTP_AUTHENTICATION: ${SMTP_AUTHENTICATION}
SMTP_ENABLE_STARTTLS_AUTO: true SMTP_ENABLE_STARTTLS_AUTO: true
USE_EVERNOTE_SANDBOX: false USE_EVERNOTE_SANDBOX: false
EMAIL_FROM_ADDRESS: $EMAIL_FROM_ADDRESS EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS}
ADDITIONAL_GEMS: $ADDITIONAL_GEMS ADDITIONAL_GEMS: ${ADDITIONAL_GEMS}
http_proxy: http_proxy:
https_proxy: https_proxy:
labels:
io.rancher.container.pull_image: always
huginn-agent-runner: huginn-agent-runner:
image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a
restart: always restart: always
external_links:
- postgres: postgres
environment: environment:
DATABASE_ADAPTER: postgresql DATABASE_ADAPTER: postgresql
POSTGRES_PORT_5432_TCP_ADDR: postgres POSTGRES_PORT_5432_TCP_ADDR: postgres
POSTGRES_PORT_5432_TCP_PORT: 5432 POSTGRES_PORT_5432_TCP_PORT: 5432
DATABASE_ADAPTER: postgresql DATABASE_NAME: ${DB_NAME}
DATABASE_NAME: huginn DATABASE_USERNAME: ${DB_USER}
DATABASE_USERNAME: huginn
DATABASE_PASSWORD: ${DB_PASSWORD} DATABASE_PASSWORD: ${DB_PASSWORD}
APP_SECRET_TOKEN: ${APP_SECRET_TOKEN} APP_SECRET_TOKEN: ${APP_SECRET_TOKEN}
DOMAIN: $DOMAIN DOMAIN: ${DOMAIN}
INVITATION_CODE: $INVITATION_CODE INVITATION_CODE: ${INVITATION_CODE}
SKIP_INVITATION_CODE: $SKIP_INVITATION_CODE SKIP_INVITATION_CODE: ${SKIP_INVITATION_CODE}
REQUIRE_CONFIRMED_EMAIL: true REQUIRE_CONFIRMED_EMAIL: ${REQUIRE_CONFIRMED_EMAIL}
SMTP_DOMAIN: $DOMAIN SMTP_DOMAIN: ${DOMAIN}
SMTP_USER_NAME: $SMTP_USER_NAME SMTP_USER_NAME: ${SMTP_USER_NAME}
SMTP_PASSWORD: $SMTP_PASSWORD SMTP_PASSWORD: ${SMTP_PASSWORD}
SMTP_SERVER: $SMTP_SERVER SMTP_SERVER: ${SMTP_SERVER}
SMTP_PORT: $SMTP_PORT SMTP_PORT: ${SMTP_PORT}
SMTP_AUTHENTICATION: $SMTP_AUTHENTICATION SMTP_AUTHENTICATION: ${SMTP_AUTHENTICATION}
SMTP_ENABLE_STARTTLS_AUTO: true SMTP_ENABLE_STARTTLS_AUTO: true
USE_EVERNOTE_SANDBOX: false USE_EVERNOTE_SANDBOX: false
EMAIL_FROM_ADDRESS: $EMAIL_FROM_ADDRESS EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS}
ADDITIONAL_GEMS: $ADDITIONAL_GEMS ADDITIONAL_GEMS: ${ADDITIONAL_GEMS}
http_proxy: http_proxy:
https_proxy: https_proxy:
labels:
io.rancher.container.pull_image: always
command: /scripts/init bin/agent_runner.rb command: /scripts/init bin/agent_runner.rb
huginn-delayed-job: huginn-delayed-job:
image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a
restart: always restart: always
external_links:
- postgres: postgres
environment: environment:
DATABASE_ADAPTER: postgresql DATABASE_ADAPTER: postgresql
POSTGRES_PORT_5432_TCP_ADDR: postgres POSTGRES_PORT_5432_TCP_ADDR: postgres
POSTGRES_PORT_5432_TCP_PORT: 5432 POSTGRES_PORT_5432_TCP_PORT: 5432
DATABASE_ADAPTER: postgresql DATABASE_NAME: ${DB_NAME}
DATABASE_NAME: huginn DATABASE_USERNAME: ${DB_USER}
DATABASE_USERNAME: huginn
DATABASE_PASSWORD: ${DB_PASSWORD} DATABASE_PASSWORD: ${DB_PASSWORD}
APP_SECRET_TOKEN: ${APP_SECRET_TOKEN} APP_SECRET_TOKEN: ${APP_SECRET_TOKEN}
DOMAIN: $DOMAIN DOMAIN: ${DOMAIN}
INVITATION_CODE: $INVITATION_CODE INVITATION_CODE: ${INVITATION_CODE}
SKIP_INVITATION_CODE: $SKIP_INVITATION_CODE SKIP_INVITATION_CODE: ${SKIP_INVITATION_CODE}
REQUIRE_CONFIRMED_EMAIL: true REQUIRE_CONFIRMED_EMAIL: ${REQUIRE_CONFIRMED_EMAIL}
SMTP_DOMAIN: $DOMAIN SMTP_DOMAIN: ${DOMAIN}
SMTP_USER_NAME: $SMTP_USER_NAME SMTP_USER_NAME: ${SMTP_USER_NAME}
SMTP_PASSWORD: $SMTP_PASSWORD SMTP_PASSWORD: ${SMTP_PASSWORD}
SMTP_SERVER: $SMTP_SERVER SMTP_SERVER: ${SMTP_SERVER}
SMTP_PORT: $SMTP_PORT SMTP_PORT: ${SMTP_PORT}
SMTP_AUTHENTICATION: $SMTP_AUTHENTICATION SMTP_AUTHENTICATION: ${SMTP_AUTHENTICATION}
SMTP_ENABLE_STARTTLS_AUTO: true SMTP_ENABLE_STARTTLS_AUTO: true
USE_EVERNOTE_SANDBOX: false USE_EVERNOTE_SANDBOX: false
EMAIL_FROM_ADDRESS: $EMAIL_FROM_ADDRESS EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS}
ADDITIONAL_GEMS: $ADDITIONAL_GEMS ADDITIONAL_GEMS: ${ADDITIONAL_GEMS}
http_proxy: http_proxy:
https_proxy: https_proxy:
labels:
io.rancher.container.pull_image: always
command: /scripts/init script/delayed_job run command: /scripts/init script/delayed_job run
volumes: volumes:

17
templates/huginn/0/rancher-compose.yml
View File

@ -9,6 +9,23 @@ catalog:
label: Database Password label: Database Password
required: true required: true
type: password type: password
- variable: DB_NAME
description: The database name
label: Database Name
required: true
default: "huginn"
type: string
- variable: DB_USER
description: The database username
label: Database Username
required: true
default: "huginn"
type: string
- variable: APP_SECRET_TOKEN
description: The secret token used by Huginn
label: App Secret Token
required: true
type: password
- variable: DOMAIN - variable: DOMAIN
description: The domain and port ( if necessary ) that should be used to get to Huginn description: The domain and port ( if necessary ) that should be used to get to Huginn
label: Domain label: Domain