Auto-add service labels
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
07125f9886
commit
ca59d303e0
|
@ -1,6 +1,4 @@
|
||||||
---
|
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -12,7 +10,6 @@ services:
|
||||||
- SAML_REAL_NAME_ATTRIBUTE
|
- SAML_REAL_NAME_ATTRIBUTE
|
||||||
- SAML_SERVICE_PROVIDER
|
- SAML_SERVICE_PROVIDER
|
||||||
- SAML_USERNAME_ATTRIBUTE
|
- SAML_USERNAME_ATTRIBUTE
|
||||||
|
|
||||||
simplesaml:
|
simplesaml:
|
||||||
image: venatorfox/simplesamlphp:latest
|
image: venatorfox/simplesamlphp:latest
|
||||||
secrets:
|
secrets:
|
||||||
|
@ -59,12 +56,10 @@ services:
|
||||||
- "traefik.http.routers.${STACK_NAME}_simplesaml.rule=(Host(`${DOMAIN}`) && PathPrefix(`/simplesaml`))"
|
- "traefik.http.routers.${STACK_NAME}_simplesaml.rule=(Host(`${DOMAIN}`) && PathPrefix(`/simplesaml`))"
|
||||||
- "traefik.http.routers.${STACK_NAME}_simplesaml.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}_simplesaml.entrypoints=web-secure"
|
||||||
- "traefik.http.routers.${STACK_NAME}_simplesaml.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}_simplesaml.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "coop-cloud.${STACK_NAME}.simplesaml.version=${ABRA_TYPE_SIMPLESAML_VERSION}-${ABRA_TYPE_SIMPLESAML_DIGEST}"
|
- coop-cloud.${STACK_NAME}.simplesaml.version=latest-9308832b
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
simplesaml:
|
simplesaml:
|
||||||
simplesaml_log:
|
simplesaml_log:
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
saml_admin_password:
|
saml_admin_password:
|
||||||
name: ${STACK_NAME}_saml_admin_password_${SECRET_SAML_ADMIN_PASSWORD_VERSION}
|
name: ${STACK_NAME}_saml_admin_password_${SECRET_SAML_ADMIN_PASSWORD_VERSION}
|
||||||
|
@ -72,7 +67,6 @@ secrets:
|
||||||
saml_secret_salt:
|
saml_secret_salt:
|
||||||
name: ${STACK_NAME}_saml_secret_salt_${SECRET_SAML_SECRET_SALT_VERSION}
|
name: ${STACK_NAME}_saml_secret_salt_${SECRET_SAML_SECRET_SALT_VERSION}
|
||||||
external: true
|
external: true
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
entrypoint_saml_conf:
|
entrypoint_saml_conf:
|
||||||
name: ${STACK_NAME}_entrypoint_saml_${SAML_ENTRYPOINT_CONF_VERSION}
|
name: ${STACK_NAME}_entrypoint_saml_${SAML_ENTRYPOINT_CONF_VERSION}
|
||||||
|
|
16
compose.yml
16
compose.yml
|
@ -1,6 +1,4 @@
|
||||||
---
|
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: mediawiki:1.35.1
|
image: mediawiki:1.35.1
|
||||||
|
@ -43,9 +41,8 @@ services:
|
||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
- "coop-cloud.${STACK_NAME}.app.version=${ABRA_TYPE_APP_VERSION}-${ABRA_TYPE_APP_DIGEST}"
|
- coop-cloud.${STACK_NAME}.app.version=1.35.1-f88c009f
|
||||||
entrypoint: /docker-entrypoint2.sh
|
entrypoint: /docker-entrypoint2.sh
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: mariadb:10.5
|
image: mariadb:10.5
|
||||||
environment:
|
environment:
|
||||||
|
@ -61,9 +58,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels: ['coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef']
|
||||||
- "coop-cloud.${STACK_NAME}.db.version=${ABRA_TYPE_DB_VERSION}-${ABRA_TYPE_DB_DIGEST}"
|
|
||||||
|
|
||||||
parsoid:
|
parsoid:
|
||||||
image: thenets/parsoid:0.11.0
|
image: thenets/parsoid:0.11.0
|
||||||
hostname: parsoidserver
|
hostname: parsoidserver
|
||||||
|
@ -72,18 +67,14 @@ services:
|
||||||
environment:
|
environment:
|
||||||
PARSOID_DOMAIN_localhost: http://app:80/api.php
|
PARSOID_DOMAIN_localhost: http://app:80/api.php
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels: ['coop-cloud.${STACK_NAME}.parsoid.version=0.11.0-c06d6623']
|
||||||
- "coop-cloud.${STACK_NAME}.parsoid.version=${ABRA_TYPE_PARSOID_VERSION}-${ABRA_TYPE_PARSOID_DIGEST}"
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mariadb:
|
mariadb:
|
||||||
mediawiki_images:
|
mediawiki_images:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
internal:
|
internal:
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
db_root_password:
|
db_root_password:
|
||||||
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
||||||
|
@ -94,7 +85,6 @@ secrets:
|
||||||
mediawiki_secret_key:
|
mediawiki_secret_key:
|
||||||
name: ${STACK_NAME}_mediawiki_secret_key_${SECRET_MEDIAWIKI_SECRET_KEY_VERSION}
|
name: ${STACK_NAME}_mediawiki_secret_key_${SECRET_MEDIAWIKI_SECRET_KEY_VERSION}
|
||||||
external: true
|
external: true
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
LocalSettings_conf:
|
LocalSettings_conf:
|
||||||
name: ${STACK_NAME}_local_settings_${LOCAL_SETTINGS_CONF_VERSION}
|
name: ${STACK_NAME}_local_settings_${LOCAL_SETTINGS_CONF_VERSION}
|
||||||
|
|
Loading…
Reference in New Issue