From 86368b1dac195a0bf30fbe68026a360a8e33cf96 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Thu, 12 Sep 2024 13:08:07 -0700 Subject: [PATCH] Update setup-lando to v3, ubuntu-24.04, and 3-edge-slim. Introduce new .lando.yml template for docs. (#49) * Update setup-lando to v3, ubuntu-24.04, and 3-edge-slim. Introduce new .lando.yml template for docs. * Add newline to config.mjs * Replace references to core/v3/lando-service.html to core/v3/services/lando.html * Remove solr 3.x from test suite due to Docker image format v1 error. * Fix links. --- .github/workflows/pr-docs-tests.yml | 2 +- .github/workflows/pr-linter.yml | 2 +- .github/workflows/pr-solr-tests.yml | 7 +++---- .github/workflows/pr-unit-tests.yml | 2 +- .github/workflows/release.yml | 2 +- .lando.yml | 28 +++++++++++++++++++--------- docs/.vitepress/config.mjs | 2 +- docs/config.md | 4 ++-- docs/index.md | 14 +++++++------- 9 files changed, 36 insertions(+), 27 deletions(-) diff --git a/.github/workflows/pr-docs-tests.yml b/.github/workflows/pr-docs-tests.yml index 4aaef50..0b0ca29 100644 --- a/.github/workflows/pr-docs-tests.yml +++ b/.github/workflows/pr-docs-tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 node-version: - '18' steps: diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml index 29a6d74..a8311d2 100644 --- a/.github/workflows/pr-linter.yml +++ b/.github/workflows/pr-linter.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 node-version: - '18' steps: diff --git a/.github/workflows/pr-solr-tests.yml b/.github/workflows/pr-solr-tests.yml index 7a62773..fe2cc6f 100644 --- a/.github/workflows/pr-solr-tests.yml +++ b/.github/workflows/pr-solr-tests.yml @@ -12,13 +12,12 @@ jobs: fail-fast: false matrix: lando-version: - - 3-dev-slim + - 3-edge-slim os: - - ubuntu-22.04 + - ubuntu-24.04 node-version: - '18' leia-test: - - examples/3.x - examples/4.x - examples/5.x - examples/6.x @@ -44,7 +43,7 @@ jobs: version: dev sync: false - name: Setup lando ${{ matrix.lando-version }} - uses: lando/setup-lando@v2 + uses: lando/setup-lando@v3 with: lando-version: ${{ matrix.lando-version }} config: | diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml index f43a08f..26a8daf 100644 --- a/.github/workflows/pr-unit-tests.yml +++ b/.github/workflows/pr-unit-tests.yml @@ -10,7 +10,7 @@ jobs: matrix: os: - windows-2022 - - ubuntu-22.04 + - ubuntu-24.04 - macos-12 node-version: - '18' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3b50e7..0bdd37b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 node-version: - '18' steps: diff --git a/.lando.yml b/.lando.yml index 9edc7e4..b95dc7d 100644 --- a/.lando.yml +++ b/.lando.yml @@ -1,14 +1,24 @@ -name: lando-solr-plugin +name: docs.solr +proxy: + cli: + - docs.solr.lndo.site:5173 services: - node: - type: node:14 - build: - - npm install + cli: + api: 4 + image: node:18 + command: sleep infinity + ports: + - 5173:5173/http scanner: false - ssl: false - sslExpose: false + user: node + build: + app: | + npm install tooling: node: - service: node + service: cli npm: - service: node + service: cli + vitepress: + service: cli + cmd: npx vitepress diff --git a/docs/.vitepress/config.mjs b/docs/.vitepress/config.mjs index 78dd284..10ee22a 100644 --- a/docs/.vitepress/config.mjs +++ b/docs/.vitepress/config.mjs @@ -53,4 +53,4 @@ function sidebar() { ], }, ]; -}; \ No newline at end of file +}; diff --git a/docs/config.md b/docs/config.md index fbb3136..48aa393 100644 --- a/docs/config.md +++ b/docs/config.md @@ -5,9 +5,9 @@ description: Learn how to configure the Lando Solr service. # Configuration -Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://docs.lando.dev/core/v3/lando-service.html) to get a good handle on how the magicks work. +Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://docs.lando.dev/core/v3/services/lando.html) to get a good handle on how the magicks work. -Also note that options, in addition to the [build steps](https://docs.lando.dev/core/v3/lando-service.html#build-steps) and [overrides](https://docs.lando.dev/core/v3/lando-service.html#overrides) that are available to every service, are shown below: +Also note that options, in addition to the [build steps](https://docs.lando.dev/core/v3/services/lando.html#build-steps) and [overrides](https://docs.lando.dev/core/v3/services/lando.html#overrides) that are available to every service, are shown below: ```yaml services: diff --git a/docs/index.md b/docs/index.md index a3b851f..23f5ad5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,7 +8,7 @@ next: ./config.html [Solr](https://solr.apache.org/) is highly reliable, scalable and fault tolerant, providing distributed indexing, replication and load-balanced querying, automated failover and recovery, centralized configuration and more. Solr powers the search and navigation features of many of the world's largest internet sites. -You can easily add it to your Lando app by adding an entry to the [services](https://docs.lando.dev/core/v3/lando-service.html) top-level config in your [Landofile](https://docs.lando.dev/core/v3). +You can easily add it to your Lando app by adding an entry to the [services](https://docs.lando.dev/core/v3/services/lando.html) top-level config in your [Landofile](https://docs.lando.dev/core/v3). ```yaml services: @@ -36,7 +36,7 @@ services: * **[7](https://hub.docker.com/_/solr/)** **(default)** * [7.7](https://hub.docker.com/_/solr/) * [7.6](https://hub.docker.com/_/solr/) -* [custom](https://docs.lando.dev/core/v3/lando-service.html#overrides) +* [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides) ## Legacy versions @@ -46,10 +46,10 @@ You can still run these versions with Lando but for all intents and purposes the * [6](https://hub.docker.com/_/solr/) * [5.5](https://hub.docker.com/_/solr/) * [5](https://hub.docker.com/_/solr/) -* [4](https://hub.docker.com/actency/docker-solr) -* [4.10](https://hub.docker.com/actency/docker-solr) -* [3](https://hub.docker.com/actency/docker-solr) -* [3.6](https://hub.docker.com/actency/docker-solr) +* [4](https://hub.docker.com/r/actency/docker-solr) +* [4.10](https://hub.docker.com/r/actency/docker-solr) +* [3](https://hub.docker.com/r/actency/docker-solr) +* [3.6](https://hub.docker.com/r/actency/docker-solr) ## Patch versions @@ -65,5 +65,5 @@ services: type: solr:5.5.5 ``` -But make sure you use one of the available [patch tags](https://hub.docker.com/library/solr/tags/) for the underlying image we are using. +But make sure you use one of the available [patch tags](https://hub.docker.com/_/solr/tags) for the underlying image we are using.