azure: update code to align with established conventions

This commit is contained in:
2025-08-12 01:21:56 -07:00
parent 2db1a03d94
commit b8aa102a01
3 changed files with 17 additions and 32 deletions

View File

@ -59,18 +59,15 @@ COMPOSE_FILE="compose.yml"
#SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION=v1
## Azure, https://azure.com
## To insert your Azure client secret:
## abra app secret insert {myapp.example.coop} azure_secret v1 "<CLIENT_SECRET>"
#COMPOSE_FILE="$COMPOSE_FILE:compose.azure.yml"
#AZURE_TENANT_ID_FILE=/run/secrets/AZURE_TENANT_ID
#AZURE_CLIENT_ID_FILE=/run/secrets/AZURE_CLIENT_ID
#AZURE_CLIENT_SECRET_FILE=/run/secrets/AZURE_CLIENT_SECRET
#AZURE_SUBSCRIPTION_ID_FILE=/run/secrets/AZURE_SUBSCRIPTION_ID
#AZURE_RESOURCE_GROUP_FILE=/run/secrets/AZURE_RESOURCE_GROUP
#SECRET_AZURE_TENANT_ID_VERSION=v1
#SECRET_AZURE_CLIENT_ID_VERSION=v1
#SECRET_AZURE_CLIENT_SECRET_VERSION=v1
#SECRET_AZURE_SUBSCRIPTION_ID_VERSION=v1
#SECRET_AZURE_RESOURCE_GROUP_VERSION=v1
#AZURE_ENABLED=1
#AZURE_TENANT_ID=
#AZURE_CLIENT_ID=
#AZURE_SUBSCRIPTION_ID=
#AZURE_RESOURCE_GROUP=
#SECRET_AZURE_SECRET_VERSION=v1
#####################################################################
# Manual wildcard certificate insertion #

View File

@ -3,31 +3,15 @@ version: "3.8"
services:
app:
environment:
- AZURE_TENANT_ID_FILE=${AZURE_TENANT_ID_FILE}
- AZURE_CLIENT_ID_FILE=${AZURE_CLIENT_ID_FILE}
- AZURE_CLIENT_SECRET_FILE=${AZURE_CLIENT_SECRET_FILE}
- AZURE_SUBSCRIPTION_ID_FILE=${AZURE_SUBSCRIPTION_ID_FILE}
- AZURE_RESOURCE_GROUP_FILE=${AZURE_RESOURCE_GROUP_FILE}
secrets:
- AZURE_TENANT_ID
- AZURE_CLIENT_ID
- AZURE_CLIENT_SECRET
- AZURE_SUBSCRIPTION_ID
- AZURE_RESOURCE_GROUP
- AZURE_CLIENT_SECRET_FILE=/run/secrets/azure_secret
secrets:
- azure_secret
secrets:
AZURE_TENANT_ID:
name: ${STACK_NAME}_AZURE_TENANT_ID_${SECRET_AZURE_TENANT_ID_VERSION}
azure_secret:
name: ${STACK_NAME}_azure_secret_${SECRET_AZURE_CLIENT_SECRET_VERSION}
external: true
AZURE_CLIENT_ID:
name: ${STACK_NAME}_AZURE_CLIENT_ID_${SECRET_AZURE_CLIENT_ID_VERSION}
external: true
AZURE_CLIENT_SECRET:
name: ${STACK_NAME}_AZURE_CLIENT_SECRET_${SECRET_AZURE_CLIENT_SECRET_VERSION}
external: true
AZURE_SUBSCRIPTION_ID:
name: ${STACK_NAME}_AZURE_SUBSCRIPTION_ID_${SECRET_AZURE_SUBSCRIPTION_ID_VERSION}
external: true
AZURE_RESOURCE_GROUP:
name: ${STACK_NAME}_AZURE_RESOURCE_GROUP_${SECRET_AZURE_RESOURCE_GROUP_VERSION}
external: true

View File

@ -11,4 +11,8 @@ export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE")
export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE")
{{ end }}
{{ if eq (env "AZURE_ENABLED") "1" }}
export AZURE_CLIENT_SECRET=$(cat "$AZURE_CLIENT_SECRET_FILE")
{{ end }}
/entrypoint.sh "$@"