diff --git a/compose.simplesaml.yml b/compose.simplesaml.yml index 26c0a8c..5eef8c5 100644 --- a/compose.simplesaml.yml +++ b/compose.simplesaml.yml @@ -1,4 +1,6 @@ +--- version: "3.8" + services: app: volumes: @@ -10,6 +12,7 @@ services: - SAML_REAL_NAME_ATTRIBUTE - SAML_SERVICE_PROVIDER - SAML_USERNAME_ATTRIBUTE + simplesaml: image: venatorfox/simplesamlphp:latest secrets: @@ -56,10 +59,11 @@ services: - "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.tls.certresolver=${LETS_ENCRYPT_ENV}" - - coop-cloud.${STACK_NAME}.simplesaml.version=latest-9308832b + volumes: simplesaml: simplesaml_log: + secrets: saml_admin_password: name: ${STACK_NAME}_saml_admin_password_${SECRET_SAML_ADMIN_PASSWORD_VERSION} @@ -67,6 +71,7 @@ secrets: saml_secret_salt: name: ${STACK_NAME}_saml_secret_salt_${SECRET_SAML_SECRET_SALT_VERSION} external: true + configs: entrypoint_saml_conf: name: ${STACK_NAME}_entrypoint_saml_${SAML_ENTRYPOINT_CONF_VERSION} diff --git a/compose.yml b/compose.yml index 2b201c0..b79ad25 100644 --- a/compose.yml +++ b/compose.yml @@ -1,4 +1,6 @@ +--- version: "3.8" + services: app: image: mediawiki:1.36.1 @@ -42,8 +44,9 @@ services: - "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}.entrypoints=web-secure" - - coop-cloud.${STACK_NAME}.app.version=1.36.1-8461f84d + - "coop-cloud.${STACK_NAME}.version=1.0.0+1.36.1" entrypoint: /docker-entrypoint2.sh + db: image: mariadb:10.6 environment: @@ -58,8 +61,7 @@ services: - db_password networks: - internal - deploy: - labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] + parsoid: image: thenets/parsoid:0.11.0 hostname: parsoidserver @@ -67,15 +69,16 @@ services: - internal environment: PARSOID_DOMAIN_localhost: http://app:80/api.php - deploy: - labels: ['coop-cloud.${STACK_NAME}.parsoid.version=0.11.0-c06d6623'] + volumes: mariadb: mediawiki_images: + networks: proxy: external: true internal: + secrets: db_root_password: name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION} @@ -86,6 +89,7 @@ secrets: mediawiki_secret_key: name: ${STACK_NAME}_mediawiki_secret_key_${SECRET_MEDIAWIKI_SECRET_KEY_VERSION} external: true + configs: LocalSettings_conf: name: ${STACK_NAME}_local_settings_${LOCAL_SETTINGS_CONF_VERSION}