Compare commits

...

11 Commits

Author SHA1 Message Date
3wc
2e68186042 chore: publish 2.0.0+v2.9.1 release
Some checks failed
continuous-integration/drone/push Build is failing
2022-10-18 17:09:44 -04:00
3wc
975d8e01a4 Use $STACK_NAME for default router name..
Some checks failed
continuous-integration/drone/push Build is failing
..instead of hard-coded `traefik`
2022-10-18 17:06:11 -04:00
fcff3a2d6a syntax
Some checks failed
continuous-integration/drone/push Build is failing
minor
2022-10-13 16:51:46 +00:00
981d2a3808 chore: publish 1.1.1+v2.8.1 release
Some checks failed
continuous-integration/drone/push Build is failing
2022-07-14 10:47:58 +02:00
29eb1058cd chore: publish 1.1.0+v2.8.0 release
Some checks failed
continuous-integration/drone/push Build is failing
2022-07-01 11:35:28 +02:00
df49a1f3b2 use domain env var
Some checks failed
continuous-integration/drone/push Build is failing
2022-03-27 21:12:16 +02:00
3wc
099dcfaed0 Add compy support
Some checks failed
continuous-integration/drone/push Build is failing
2022-03-26 23:49:10 +02:00
1d7542cd5f fix: drop minio config changes for now
New version is hard to config, unsure if this is needed.
2022-01-06 11:12:47 +01:00
5e1604322e fix: bump vendored config 2022-01-06 10:06:04 +01:00
36707989d2 fix: add missing entrypoints (matrix, minio) 2022-01-06 10:01:52 +01:00
29f90fe409 feat: minio port 2022-01-06 09:50:35 +01:00
8 changed files with 42 additions and 14 deletions

View File

@ -1,6 +1,6 @@
TYPE=traefik TYPE=traefik
DOMAIN=traefik.example.com DOMAIN={{ .Domain }}
LETS_ENCRYPT_ENV=production LETS_ENCRYPT_ENV=production
LETS_ENCRYPT_EMAIL=certs@example.com LETS_ENCRYPT_EMAIL=certs@example.com
@ -71,6 +71,10 @@ COMPOSE_FILE="compose.yml"
#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
#SMTP_ENABLED=1 #SMTP_ENABLED=1
## Compy
#COMPOSE_FILE="$COMPOSE_FILE:compose.compy.yml"
#COMPY_ENABLED=1
## Gitea SSH ## Gitea SSH
# COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml" # COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml"
# GITEA_SSH_ENABLED=1 # GITEA_SSH_ENABLED=1

View File

@ -21,6 +21,6 @@
2. `abra app new traefik` 2. `abra app new traefik`
3. `abra app YOURAPPDOMAIN config` - be sure to change `DOMAIN` to something that resolves to 3. `abra app YOURAPPDOMAIN config` - be sure to change `DOMAIN` to something that resolves to
your Docker swarm box your Docker swarm box
4. `abra app YOURAPPDOMAIN deploy` 4. `abra app deploy YOURAPPDOMAIN`
[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra [`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v12 export TRAEFIK_YML_VERSION=v14
export FILE_PROVIDER_YML_VERSION=v6 export FILE_PROVIDER_YML_VERSION=v6
export ENTRYPOINT_VERSION=v2 export ENTRYPOINT_VERSION=v2

7
compose.compy.yml Normal file
View File

@ -0,0 +1,7 @@
version: "3.8"
services:
app:
environment:
- COMPY_ENABLED
ports:
- "9999:9999"

View File

@ -10,5 +10,5 @@ services:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.services.traefik.loadbalancer.server.port=web" - "traefik.http.services.traefik.loadbalancer.server.port=web"
- "traefik.http.routers.traefik.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.traefik.service=api@internal" - "traefik.http.routers.${STACK_NAME}.service=api@internal"

9
compose.minio.yml Normal file
View File

@ -0,0 +1,9 @@
---
version: "3.8"
services:
app:
environment:
- MINIO_CONSOLE_ENABLED
ports:
- "9001:9001"

View File

@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: "traefik:v2.5.6" image: "traefik:v2.9.1"
# Note(decentral1se): *please do not* add any additional ports here. # Note(decentral1se): *please do not* add any additional ports here.
# Doing so could break new installs with port conflicts. Please use # Doing so could break new installs with port conflicts. Please use
# the usual `compose.$app.yml` approach for any additional ports # the usual `compose.$app.yml` approach for any additional ports
@ -40,14 +40,14 @@ services:
order: start-first order: start-first
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.services.traefik.loadbalancer.server.port=web" - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=web"
- "traefik.http.routers.traefik.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
- "traefik.http.routers.traefik.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.traefik.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.traefik.tls.options=default@file" - "traefik.http.routers.${STACK_NAME}.tls.options=default@file"
- "traefik.http.routers.traefik.service=api@internal" - "traefik.http.routers.${STACK_NAME}.service=api@internal"
- "traefik.http.routers.traefik.middlewares=security@file" - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
- "coop-cloud.${STACK_NAME}.version=1.0.1+v2.5.6" - "coop-cloud.${STACK_NAME}.version=2.0.0+v2.9.1"
networks: networks:
proxy: proxy:

View File

@ -54,10 +54,18 @@ entrypoints:
mumble-udp: mumble-udp:
address: ":64738/udp" address: ":64738/udp"
{{ end }} {{ end }}
{{ if eq (env "COMPY_ENABLED") "1" }}
compy:
address: ":9999"
{{ end }}
{{ if eq (env "METRICS_ENABLED") "1" }} {{ if eq (env "METRICS_ENABLED") "1" }}
metrics: metrics:
address: ":8082" address: ":8082"
{{ end }} {{ end }}
{{ if eq (env "MATRIX_FEDERATION_ENABLED") "1" }}
matrix-federation:
address: ":9001"
{{ end }}
ping: ping:
entryPoint: web entryPoint: web