Compare commits

...

8 Commits

Author SHA1 Message Date
3wc 46010aeb95 Enable Gandi DNS challenge for Letsencrypt
continuous-integration/drone/push Build is failing Details
2021-07-18 16:30:22 +02:00
Renovate Bot 0421dd4747 Update traefik Docker tag to v2.4.11
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is failing Details
2021-07-16 07:03:32 +00:00
decentral1se eb69ba9309
Expose host mode networking for mssql
continuous-integration/drone/push Build is failing Details
See https://github.com/WASHNote/washnote-apps/issues/17.
2021-07-07 15:58:08 +02:00
decentral1se 21cd25f3d6
Quote and version headless
continuous-integration/drone/push Build is failing Details
2021-06-27 20:19:04 +02:00
decentral1se f9b3475086
Version v2.4.9; sync labels
continuous-integration/drone/push Build is failing Details
2021-06-27 20:18:21 +02:00
decentral1se ef443bae50
Add "headless mode" config
continuous-integration/drone/push Build is failing Details
Closes #24.
2021-06-27 20:17:41 +02:00
Renovate Bot aacf00309e Update traefik Docker tag to v2.4.9
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is failing Details
2021-06-23 07:03:18 +00:00
decentral1se f73e38d143
Use new image namespace
continuous-integration/drone/push Build is failing Details
2021-06-21 12:32:15 +02:00
9 changed files with 65 additions and 10 deletions

View File

@ -25,7 +25,7 @@ kind: pipeline
name: recipe release
steps:
- name: release a new version
image: decentral1se/drone-abra:latest
image: thecoopcloud/drone-abra:latest
settings:
command: recipe traefik release
deploy_key:

View File

@ -21,6 +21,11 @@ LOG_LEVEL=WARN
# SECRET_OVH_APP_SECRET_VERSION=v1
# SECRET_OVH_CONSUMER_KEY=v1
## Gandi configuration
# COMPOSE_FILE="compose.yml:compose.gandi.yml"
# GANDI_ENABLED=1
# SECRET_GANDIV5_API_KEY_VERSION=v1
## Enable Keycloak
#COMPOSE_FILE="compose.yml:compose.keycloak.yml"
#KEYCLOAK_MIDDLEWARE_ENABLED=1
@ -51,3 +56,6 @@ LOG_LEVEL=WARN
## Host-mode networking
#COMPOSE_FILE="compose.yml:compose.host.yml"
## "Headless mode" (no domain configured)
#COMPOSE_FILE="compose.yml:compose.headless.yml"

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v9
export TRAEFIK_YML_VERSION=v10
export FILE_PROVIDER_YML_VERSION=v2
export ENTRYPOINT_VERSION=v1
export ENTRYPOINT_VERSION=v2

15
compose.gandi.yml Normal file
View File

@ -0,0 +1,15 @@
version: "3.8"
services:
app:
environment:
- GANDIV5_API_KEY_FILE=/run/secrets/gandiv5_api_key
- LETS_ENCRYPT_DNS_CHALLENGE_ENABLED
- LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER
secrets:
- gandiv5_api_key
secrets:
gandiv5_api_key:
name: ${STACK_NAME}_gandiv5_api_key_${SECRET_GANDIV5_API_KEY_VERSION}
external: true

15
compose.headless.yml Normal file
View File

@ -0,0 +1,15 @@
---
version: "3.8"
services:
app:
deploy:
update_config:
failure_action: rollback
order: start-first
labels:
- "traefik.enable=true"
- "traefik.http.services.traefik.loadbalancer.server.port=web"
- "traefik.http.routers.traefik.entrypoints=web-secure"
- "traefik.http.routers.traefik.service=api@internal"
- "coop-cloud.${STACK_NAME}.app.version=v2.4.9-be23e1f6"

View File

@ -4,4 +4,7 @@ services:
environment:
- MSSQL_ENABLED
ports:
- "1433:1433"
- target: 1433
published: 1433
protocol: tcp
mode: host

View File

@ -1,7 +1,7 @@
version: "3.8"
services:
app:
image: "traefik:v2.4.8"
image: "traefik:v2.4.11"
# 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
@ -45,7 +45,7 @@ services:
- "traefik.http.routers.traefik.tls.options=default@file"
- "traefik.http.routers.traefik.service=api@internal"
- "traefik.http.routers.traefik.middlewares=security@file"
- coop-cloud.${STACK_NAME}.app.version=v2.4.8-d7d63b0d
- "coop-cloud.${STACK_NAME}.app.version=v2.4.9-be23e1f6"
networks:
proxy:
external: true

View File

@ -7,4 +7,8 @@ export OVH_CONSUMER_KEY=$(cat "$OVH_CONSUMER_KEY_FILE")
export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE")
{{ end }}
{{ if eq (env "GANDI_ENABLED") "1" }}
export GANDIV5_API_KEY=$(cat "$GANDIV5_API_KEY_FILE")
{{ end }}
/entrypoint.sh "$@"

View File

@ -60,13 +60,23 @@ certificatesResolvers:
caServer: "https://acme-staging-v02.api.letsencrypt.org/directory"
httpChallenge:
entryPoint: web
{{ if eq (env "LETS_ENCRYPT_DNS_CHALLENGE_ENABLED") "1" }}
dnsChallenge:
provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
resolvers:
- "1.1.1.1:53"
- "8.8.8.8:53"
{{ end }}
production:
acme:
email: {{ env "LETS_ENCRYPT_EMAIL" }}
storage: /etc/letsencrypt/production-acme.json
httpChallenge:
entryPoint: web
{{ if eq (env "LETS_ENCRYPT_DNS_CHALLENGE_ENABLED") "1" }}
dnsChallenge:
provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
{{ end }}
{{ if eq (env "LETS_ENCRYPT_DNS_CHALLENGE_ENABLED") "1" }}
dnsChallenge:
provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
resolvers:
- "1.1.1.1:53"
- "8.8.8.8:53"
{{ end }}