Skip to content

Commit bf88ea4

Browse files
authored
chore: align main with develop for release (#1021)
1 parent 35d5b52 commit bf88ea4

78 files changed

Lines changed: 2872 additions & 137 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 12 additions & 0 deletions

CONTRIBUTING.md

Lines changed: 22 additions & 3 deletions

README.md

Lines changed: 9 additions & 2 deletions

backend/docker-compose.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,31 @@ services:
123123
# No LETSENCRYPT_* — the cert is anchored on snapshot_sharing and reused
124124
# for every service that shares the same VIRTUAL_HOST.
125125

126+
# -------------------------------------------------------------------------
127+
# schema_converter — schema conversion orchestration service.
128+
# Mounted at /schema-converter/ (path stripped before forwarding).
129+
# Source: https://github.com/MetaConfigurator/schema-conversion-orchestrator
130+
#
131+
# The image is published to GHCR by the schema-converter CI on every push
132+
# to main. For local builds replace `image:` with:
133+
# build: /path/to/schema-conversion-orchestrator
134+
# -------------------------------------------------------------------------
135+
136+
schema_converter:
137+
container_name: schema_converter
138+
image: ghcr.io/metaconfigurator/schema-conversion-orchestrator:latest
139+
expose:
140+
- "5002"
141+
restart: unless-stopped
142+
networks:
143+
- backend-network
144+
environment:
145+
VIRTUAL_HOST: ${BASE_DOMAIN}
146+
VIRTUAL_PATH: /schema-converter/
147+
VIRTUAL_DEST: /
148+
VIRTUAL_PORT: 5002
149+
# No LETSENCRYPT_* — cert is anchored on snapshot_sharing.
150+
126151
# -------------------------------------------------------------------------
127152
# Shared reverse proxy + Let's Encrypt companion
128153
# -------------------------------------------------------------------------

codemeta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"Browser",
106106
"Web"
107107
],
108-
"version": "2.6.0",
108+
"version": "2.7.0",
109109
"contIntegration": "https://github.com/MetaConfigurator/meta-configurator/actions",
110110
"codemeta:continuousIntegration": {
111111
"id": "https://github.com/MetaConfigurator/meta-configurator/actions"

documentation_user/README.md

Lines changed: 1 addition & 0 deletions

documentation_user/examples/ai_assistance/README.md

Lines changed: 1 addition & 1 deletion

documentation_user/examples/ai_assistance/ai_settings.png renamed to documentation_user/examples/ai_assistance/figs/ai_settings.png

File renamed without changes.

documentation_user/examples/external_references/README.md

Lines changed: 2 additions & 2 deletions

documentation_user/examples/external_references/ref_diagram.png renamed to documentation_user/examples/external_references/figs/ref_diagram.png

File renamed without changes.

0 commit comments

Comments
 (0)