Compare commits

...

13 Commits

Author SHA1 Message Date
8ff2f3a294 Add missing env var
Some checks reported errors
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build encountered an error
2021-06-07 09:51:24 +02:00
2c745416fc Support mssql host mode connections
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is failing
2021-06-07 09:42:50 +02:00
d968028216 Push env vars to overriding configs
Some checks failed
continuous-integration/drone/push Build is failing
2021-06-05 23:02:36 +02:00
3wc
8d309bc7bf Entrypoint for SSB MUXRPC
Some checks failed
continuous-integration/drone/push Build is failing
2021-06-05 14:23:58 +02:00
18d8805c99 Remove trigger, we make the tags [ci skip] 2021-06-04 00:15:40 +02:00
bdff19882b Fix bad name in batch update script [ci skip] 2021-06-03 23:07:24 +02:00
fd9faeb021 Add release logic to CI [ci skip] 2021-06-03 23:01:32 +02:00
f26557bd40 Expose config var for RTMP port
Some checks failed
continuous-integration/drone/push Build is failing
2021-05-10 14:02:53 +02:00
2de31afe26 Use actual template language
Some checks failed
continuous-integration/drone/push Build is failing
2021-05-10 13:53:27 +02:00
028ad6ce62 Upgrade vendored config
Some checks failed
continuous-integration/drone/push Build is failing
2021-05-10 13:13:44 +02:00
ede226cea7 Add conditionl for peertube RMTP port
Some checks failed
continuous-integration/drone/push Build is failing
2021-05-10 13:04:53 +02:00
9a1dd29d01 Add RTMP optional port setup
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-10 12:58:10 +02:00
2428f5fabd Make foodsoft/gitea ports optional
All checks were successful
continuous-integration/drone/push Build is passing
Closes https://git.autonomic.zone/coop-cloud/traefik/issues/23.
2021-04-07 14:22:22 +02:00
12 changed files with 81 additions and 9 deletions

View File

@ -19,3 +19,13 @@ steps:
trigger: trigger:
branch: branch:
- master - master
---
kind: pipeline
name: recipe release
steps:
- name: release a new version
image: decentral1se/drone-abra:latest
settings:
command: recipe traefik release
deploy_key:
from_secret: abra_bot_deploy_key

View File

@ -17,10 +17,24 @@ LOG_LEVEL=WARN
#SMTP_ENABLED=1 #SMTP_ENABLED=1
## Gitea SSH ## Gitea SSH
# COMPOSE_FILE="compose.yml:compose.gitea.yml"
# GITEA_SSH_ENABLED=1 # GITEA_SSH_ENABLED=1
## Foodsoft SMTP ## Foodsoft SMTP
# COMPOSE_FILE="compose.yml:compose.foodsoft.yml"
# FOODSOFT_SMTP_ENABLED=1 # FOODSOFT_SMTP_ENABLED=1
## Peertube RTMP
# COMPOSE_FILE="compose.yml:compose.peertube.yml"
# PEERTUBE_RTMP_ENABLED=1
## Secure Scuttlebutt MUXRPC
# COMPOSE_FILE="compose.yml:compose.ssb.yml"
# SSB_MUXRPC_ENABLED=1
## MSSQL
# COMPOSE_FILE="compose.yml:compose.mssql.yml"
# MSSQL_ENABLED=1
## Host-mode networking ## Host-mode networking
#COMPOSE_FILE="compose.yml:compose.host.yml" #COMPOSE_FILE="compose.yml:compose.host.yml"

View File

@ -1,2 +1,2 @@
export TRAEFIK_YML_VERSION=v5 export TRAEFIK_YML_VERSION=v8
export FILE_PROVIDER_YML_VERSION=v1 export FILE_PROVIDER_YML_VERSION=v2

7
compose.foodsoft.yml Normal file
View File

@ -0,0 +1,7 @@
version: "3.8"
services:
app:
environment:
- FOODSOFT_SMTP_ENABLED
ports:
- "2525:2525"

7
compose.gitea.yml Normal file
View File

@ -0,0 +1,7 @@
version: "3.8"
services:
app:
environment:
- GITEA_SSH_ENABLED
ports:
- "2222:2222"

7
compose.mssql.yml Normal file
View File

@ -0,0 +1,7 @@
version: "3.8"
services:
app:
environment:
- MSSQL_ENABLED
ports:
- "1433:1433"

7
compose.peertube.yml Normal file
View File

@ -0,0 +1,7 @@
version: "3.8"
services:
app:
environment:
- PEERTUBE_RTMP_ENABLED
ports:
- "1935:1935"

View File

@ -3,5 +3,7 @@ version: "3.8"
services: services:
app: app:
environment:
- SMTP_ENABLED
ports: ports:
- "587:587" - "587:587"

7
compose.ssb.yml Normal file
View File

@ -0,0 +1,7 @@
version: "3.8"
services:
app:
environment:
- SSB_MUXRPC_ENABLED
ports:
- "8008:8008"

View File

@ -2,11 +2,12 @@ version: "3.8"
services: services:
app: app:
image: "traefik:v2.4.8" image: "traefik:v2.4.8"
# Note(decentral1se): *please do not* add any additional ports here.
# Doing so could break new installs with port conflicts. Please use
# the usual `compose.$app.yml` approach for any additional ports
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "2222:2222"
- "2525:2525"
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
- "letsencrypt:/etc/letsencrypt" - "letsencrypt:/etc/letsencrypt"
@ -19,10 +20,7 @@ services:
- proxy - proxy
environment: environment:
- DASHBOARD_ENABLED - DASHBOARD_ENABLED
- FOODSOFT_SMTP_ENABLED
- GITEA_SSH_ENABLED
- LOG_LEVEL - LOG_LEVEL
- SMTP_ENABLED
healthcheck: healthcheck:
test: ["CMD", "traefik", "healthcheck"] test: ["CMD", "traefik", "healthcheck"]
interval: 30s interval: 30s
@ -49,10 +47,11 @@ networks:
configs: configs:
traefik_yml: traefik_yml:
name: ${STACK_NAME}_traefik_yml_${TRAEFIK_YML_VERSION} name: ${STACK_NAME}_traefik_yml_${TRAEFIK_YML_VERSION}
file: traefik.yml file: traefik.yml.tmpl
template_driver: golang template_driver: golang
file_provider_yml: file_provider_yml:
name: ${STACK_NAME}_file_provider_yml_${FILE_PROVIDER_YML_VERSION} name: ${STACK_NAME}_file_provider_yml_${FILE_PROVIDER_YML_VERSION}
file: file-provider.yml file: file-provider.yml.tmpl
template_driver: golang
volumes: volumes:
letsencrypt: letsencrypt:

View File

@ -36,6 +36,18 @@ entrypoints:
smtp-submission: smtp-submission:
address: ":587" address: ":587"
{{ end }} {{ end }}
{{ if eq (env "PEERTUBE_RTMP_ENABLED") "1" }}
peertube-rtmp:
address: ":1935"
{{ end }}
{{ if eq (env "SSB_MUXRPC_ENABLED") "1" }}
ssb-muxrpc:
address: ":8008"
{{ end }}
{{ if eq (env "MSSQL_ENABLED") "1" }}
mssql:
address: ":1433"
{{ end }}
ping: ping:
entryPoint: web entryPoint: web