Skip to content

Commit

Permalink
Update setup-lando to v3, ubuntu-24.04, and 3-edge-slim. Introduce ne…
Browse files Browse the repository at this point in the history
…w .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.
  • Loading branch information
reynoldsalec authored Sep 12, 2024
1 parent 3124203 commit 86368b1
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/pr-solr-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
matrix:
os:
- windows-2022
- ubuntu-22.04
- ubuntu-24.04
- macos-12
node-version:
- '18'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand Down
28 changes: 19 additions & 9 deletions .lando.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion docs/.vitepress/config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ function sidebar() {
],
},
];
};
};
4 changes: 2 additions & 2 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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.

0 comments on commit 86368b1

Please sign in to comment.