OPSEXP-4102: Update download trial compose files#1515
Closed
gionn wants to merge 27 commits into
Closed
Conversation
…lity matrix fixes (#1137)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
… [skip ci] Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…1138) Co-authored-by: Alex Chapellon <alexandre.chapellon@alfresco.com> Co-authored-by: Adelaide Nxumalo <27953420+anxumalo@users.noreply.github.com> Co-authored-by: Paweł Maciusiak <158472457+pmacius@users.noreply.github.com>
Co-authored-by: Giovanni Toraldo <giovanni.toraldo@hyland.com>
Co-authored-by: pmacius <pmacius@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Co-authored-by: Paweł Maciusiak <158472457+pmacius@users.noreply.github.com>
Co-authored-by: alxgomz <2311899+alxgomz@users.noreply.github.com>
Manually force shorthand syntax in compose file to avoid breaking old ruamel lib
Co-authored-by: ffjdm <18267527+ffjdm@users.noreply.github.com> Co-authored-by: Frantz FISCHER <frantz.fischer@hyland.com>
Co-authored-by: pmacius <158472457+pmacius@users.noreply.github.com> Co-authored-by: pmacius <pawel.maciusiak@hyland.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges the latest download-trial branch changes into master, updating Docker Compose “download trial” assets and aligning Helm chart values/dependencies and repository documentation with the new structure (including a new Jekyll/Just-the-Docs site under docs/).
Changes:
- Restructures Docker Compose artifacts (new default enterprise/community compose, versioned compose updates, and updated image tags).
- Bumps Helm chart version/dependencies and refreshes multiple version-specific Helm values files.
- Migrates and reorganizes documentation into a Jekyll site with Mermaid diagrams (replacing PlantUML sources) and adds a docs publishing workflow.
Reviewed changes
Copilot reviewed 79 out of 92 changed files in this pull request and generated 10 comments.
Show a summary per file
| File | Description |
|---|---|
| README.md | Replaces long-form README content with a link to the published docs site; updates release-process link target. |
| helm/alfresco-content-services/values.yaml | Updates several default image tags and chart values (including sync/ATS/AIS). |
| helm/alfresco-content-services/README.md.gotmpl | Adds Jekyll front matter for docs site navigation. |
| helm/alfresco-content-services/README.md | Regenerates chart README with updated versions and front matter. |
| helm/alfresco-content-services/pre-release_values.yaml | Updates pre-release image tags (ATS/AIS/Share/ADW/ACC/Sync). |
| helm/alfresco-content-services/community_values.yaml | Disables postgresql-sync for community values. |
| helm/alfresco-content-services/Chart.yaml | Bumps chart version and dependency versions. |
| helm/alfresco-content-services/Chart.lock | Updates dependency lock digest/timestamp. |
| helm/alfresco-content-services/7.4.N_values.yaml | Updates 7.4.N component tags and DTAS assertion version. |
| helm/alfresco-content-services/7.3.N_values.yaml | Updates 7.3.N component tags and DTAS assertions (incl. module versions). |
| helm/alfresco-content-services/7.2.N_values.yaml | Updates 7.2.N component tags and DTAS assertions. |
| helm/alfresco-content-services/7.1.N_values.yaml | Updates 7.1.N ADW image tag. |
| helm/acs-sso-example/values.yaml | Pins Keycloak image tag. |
| helm/acs-sso-example/README.md.gotmpl | Adds Jekyll front matter; switches values section template. |
| helm/acs-sso-example/README.md | Adds front matter; updates links and converts values table format. |
| helm/acs-sso-example/docs/step-by-step-guide.md | Adds front matter and fixes various links/typos/formatting. |
| helm/acs-sso-example/docs/sso-guide.md | Adds front matter and reflows introduction text. |
| helm/acs-sso-example/Chart.yaml | Fixes SSO guide link and sources URL. |
| Gemfile.lock | Adds Ruby dependency lockfile for Jekyll docs tooling. |
| Gemfile | Adds Jekyll/Just-the-Docs/html-proofer gem dependencies. |
| docs/index.md | Introduces docs site home page content (migrated from README). |
| docs/helm/values/letsencrypt_values.yaml | Adds example values for cert-manager/LetsEncrypt annotations. |
| docs/helm/upgrades.md | Adds Jekyll front matter and edits content/links. |
| docs/helm/storage.md | Adds front matter and replaces diagram reference with Mermaid. |
| docs/helm/security.md | Adds Jekyll front matter. |
| docs/helm/registry-authentication.md | Adds Jekyll front matter. |
| docs/helm/README.md | Major rewrite: adds Mermaid architecture diagrams and updates links. |
| docs/helm/kind-deployment.md | Adds Jekyll front matter. |
| docs/helm/ingress-nginx.md | Adds Jekyll front matter and tweaks command formatting + adds references. |
| docs/helm/images/helm-enterprise.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/helm/images/helm-eks-s3-rds-mq-ooi.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/helm/images/helm-eks-s3-rds-mq-ai.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/helm/images/helm-eks-enterprise.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/helm/images/helm-eks-community.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/helm/images/helm-eks-aws-services.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/helm/images/helm-community.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/helm/images/charts-storage-persistence.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/helm/examples/with-ooi.md | Adds front matter and replaces PNG diagram with Mermaid. |
| docs/helm/examples/with-ms-teams.md | Adds front matter. |
| docs/helm/examples/with-keycloak.md | Adds front matter. |
| docs/helm/examples/with-external-infrastructure.md | Adds front matter. |
| docs/helm/examples/with-aws-services.md | Adds front matter and replaces PNG diagrams with Mermaid. |
| docs/helm/examples/with-ai.md | Adds front matter and replaces PNG diagram with Mermaid. |
| docs/helm/examples/search-services.md | Adds front matter and updates link anchors. |
| docs/helm/examples/external-hazelcast.md | Adds front matter and updates links/formatting. |
| docs/helm/examples/customisation-guidelines.md | Adds front matter and updates links. |
| docs/helm/eks-deployment.md | Adds front matter and significantly refreshes EKS deployment guide + Mermaid diagrams. |
| docs/helm/desktop-deployment.md | Adds front matter and updates links/anchors. |
| docs/helm/autoscaling.md | Adds front matter. |
| docs/helm.md | Adds nav stub for Helm docs section. |
| docs/helm-guides.md | Adds nav stub for Helm “Guides” section. |
| docs/helm-examples.md | Adds nav stub for Helm “Examples” section. |
| docs/helm-deployment.md | Adds nav stub for Helm “Deployment” section. |
| docs/helm-charts.md | Adds nav stub for Helm “Charts” section. |
| docs/docker-compose/README.md | Adds front matter and replaces PNG diagrams with Mermaid. |
| docs/docker-compose/images/docker-compose-enterprise.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/docker-compose/images/docker-compose-community.puml | Removed PlantUML source (replaced by Mermaid diagrams in docs). |
| docs/docker-compose/examples/customisation-guidelines.md | Adds front matter and updates links. |
| docs/compose.md | Adds nav stub for Docker Compose docs section. |
| docker-compose/pre-release-docker-compose.yml | Updates multiple pre-release image tags. |
| docker-compose/docker-compose.yml | Replaces the default enterprise compose with a Traefik-based stack + updated component set. |
| docker-compose/community-docker-compose.yml | Replaces the default community compose with a Traefik-based stack + updated image tags. |
| docker-compose/7.4.N-docker-compose.yml | Updates 7.4.N image tags (repo/share/ATS/ADW/ACC). |
| docker-compose/7.3.N-docker-compose.yml | Updates 7.3.N image tags (repo/share/ADW). |
| docker-compose/7.2.N-docker-compose.yml | Updates 7.2.N image tags (repo/share/ADW). |
| docker-compose/7.1.N-docker-compose.yml | Updates 7.1.N ADW image tag. |
| .ruby-version | Pins Ruby version for docs tooling. |
| .markdownlint.yaml | Disables MD025. |
| .gitignore | Ignores Jekyll build output (_site). |
| .github/workflows/pre-commit-helm.yml | Updates pinned action versions/SHAs. |
| .github/workflows/pre-commit-compose.yml | Updates Alfresco build-tools action version. |
| .github/workflows/helm-static-checks.yml | Updates pinned checkout SHA and build-tools action versions. |
| .github/workflows/helm-release.yml | Updates pinned checkout SHA and build-tools action version. |
| .github/workflows/helm-enterprise.yml | Updates pinned checkout SHA, setup-helm action SHA, and build-tools versions. |
| .github/workflows/helm-community.yml | Updates pinned checkout SHA, setup-helm action SHA, and build-tools versions. |
| .github/workflows/docs.yml | Adds docs publishing workflow (reusable workflow). |
| .github/workflows/docker-compose-enterprise.yml | Updates pinned checkout SHA and build-tools action version. |
| .github/workflows/docker-compose-community.yml | Updates build-tools action version. |
| .github/workflows/bumpVersions.yml | Updates pinned checkout SHA, updatecli action SHA, build-tools version, and git-auto-commit SHA. |
| _sass/color_schemes/alfresco.scss | Adds custom Just-the-Docs color scheme and typography tweaks. |
| _includes/head_custom.html | Adds Google Fonts import for docs site. |
| _config.yml | Adds Jekyll/Just-the-Docs site configuration (theme/nav/edit links/mermaid). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| interval: 10s | ||
| retries: 5 | ||
| start_period: 30s | ||
| image: kibana:7.17.26 |
Comment on lines
63
to
+65
| environment: | ||
| APP_BASE_SHARE_URL: "http://localhost:8080/aca/#/preview/s" | ||
| APP_BASE_SHARE_URL: http://localhost:8080/aca/#/preview/s | ||
| healthcheck: |
Comment on lines
+44
to
+55
| traefik.http.middlewares.acsfakeauth.basicauth.users: 'fake:' | ||
| traefik.http.middlewares.alfresco-chain.chain.middlewares: alfresco-root-redirect@docker,limit@docker | ||
| traefik.http.middlewares.alfresco-root-redirect.redirectregex.regex: ^https?://[^/]+/([^/.]+)$$ | ||
| traefik.http.middlewares.alfresco-root-redirect.redirectregex.replacement: $$0/ | ||
| traefik.http.middlewares.limit.buffering.maxRequestBodyBytes: "5368709120" | ||
| traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange: 127.0.0.0/8 | ||
| traefik.http.routers.alfresco.middlewares: alfresco-chain@docker | ||
| traefik.http.routers.alfresco.rule: PathPrefix(`/`) | ||
| traefik.http.routers.alfrescomicrometer.middlewares: prometheusipfilter@docker | ||
| traefik.http.routers.alfrescomicrometer.rule: PathRegexp(`^/alfresco/(wc)?s(ervice)?/prometheus`) | ||
| traefik.http.routers.solrapideny.middlewares: acsfakeauth@docker | ||
| traefik.http.routers.solrapideny.rule: PathRegexp(`^/alfresco/(wc)?s(ervice)?/api/solr/.*$$`) |
Comment on lines
+339
to
+341
| traefik.http.middlewares.sharefakeauth.basicauth.users: 'fake:' | ||
| traefik.http.routers.proxiedsolrapideny.middlewares: sharefakeauth@docker | ||
| traefik.http.routers.proxiedsolrapideny.rule: PathRegexp(`^/share/proxy/alfresco(-(noauth|feed|api))?/api/solr/`) |
Comment on lines
+44
to
+55
| traefik.http.middlewares.acsfakeauth.basicauth.users: 'fake:' | ||
| traefik.http.middlewares.alfresco-chain.chain.middlewares: alfresco-root-redirect@docker,limit@docker | ||
| traefik.http.middlewares.alfresco-root-redirect.redirectregex.regex: ^https?://[^/]+/([^/.]+)$$ | ||
| traefik.http.middlewares.alfresco-root-redirect.redirectregex.replacement: $$0/ | ||
| traefik.http.middlewares.limit.buffering.maxRequestBodyBytes: "5368709120" | ||
| traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange: 127.0.0.0/8 | ||
| traefik.http.routers.alfresco.middlewares: alfresco-chain@docker | ||
| traefik.http.routers.alfresco.rule: PathPrefix(`/`) | ||
| traefik.http.routers.alfrescomicrometer.middlewares: prometheusipfilter@docker | ||
| traefik.http.routers.alfrescomicrometer.rule: PathRegexp(`^/alfresco/(wc)?s(ervice)?/prometheus`) | ||
| traefik.http.routers.solrapideny.middlewares: acsfakeauth@docker | ||
| traefik.http.routers.solrapideny.rule: PathRegexp(`^/alfresco/(wc)?s(ervice)?/api/solr/.*$$`) |
Comment on lines
+201
to
+203
| traefik.http.middlewares.sharefakeauth.basicauth.users: 'fake:' | ||
| traefik.http.routers.proxiedsolrapideny.middlewares: sharefakeauth@docker | ||
| traefik.http.routers.proxiedsolrapideny.rule: PathRegexp(`^/share/proxy/alfresco(-(noauth|feed|api))?/api/solr/`) |
Comment on lines
+23
to
+28
| publish: | ||
| uses: Alfresco/jekyll-build-tools/.github/workflows/jekyll-publish.yml@main | ||
| with: | ||
| working-directory: . | ||
| publish: ${{ github.event_name == 'push' && github.ref_name == 'master'}} | ||
| validate-html: true |
Comment on lines
+1
to
+3
| <style> | ||
| @import url('https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap') | ||
| </style> |
Comment on lines
21
to
+22
| * Search Enterprise is now the default search engine when installing Enterprise | ||
| version. For production it's suggested to use an [external elaticsearch | ||
| index](examples/with-external-infrastructure.md#elasticsearch-index). | ||
| version. For production it's suggested to use an [external elaticsearch index](examples/with-external-infrastructure.md#elasticsearch-index). |
Comment on lines
+6
to
+7
| url: https://alfresco.github.io | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
OPSEXP-4102
This PR merges the latest state of the
download-trialbranch into master, incorporating automated updates to download trial Docker Compose files and a manual fix for a ruamel compatibility issue.Key changes
.yamlto.ymlconvention and introduced version-specific files (7.1.N,7.2.N,7.3.N,7.4.N) replacing the older25.N/23.Nversioning schemecompose.yaml,community-compose.yaml, andpre-release-compose.yamlwithdocker-compose.yml,community-docker-compose.yml, andpre-release-docker-compose.ymlruamellibrary versionsupdatecli-matrix-targets.yamlto the repository roothxi-overrides.yaml,kics.yml,download-trials-release.ymlworkflow, KEDA helpers and scalers, and related test values