From 75b885f52493d6c5bd266533e3b161da8c4ceec6 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Mon, 9 Sep 2024 11:58:41 -0700 Subject: [PATCH 1/3] Update setup-lando to v3, ubuntu-24.04, and 3-edge-slim. Introduce new .lando.yml template for docs. --- .github/workflows/pr-docs-tests.yml | 2 +- .github/workflows/pr-linter.yml | 2 +- .github/workflows/pr-unit-tests.yml | 2 +- .github/workflows/pr-varnish-tests.yml | 6 +++--- .github/workflows/release.yml | 2 +- .lando.yml | 28 +++++++++++++++++--------- 6 files changed, 26 insertions(+), 16 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-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/pr-varnish-tests.yml b/.github/workflows/pr-varnish-tests.yml index 7e78b2c..cd55e51 100644 --- a/.github/workflows/pr-varnish-tests.yml +++ b/.github/workflows/pr-varnish-tests.yml @@ -16,9 +16,9 @@ jobs: - examples/6.x - examples/custom lando-version: - - 3-dev-slim + - 3-edge-slim os: - - ubuntu-22.04 + - ubuntu-24.04 node-version: - '18' steps: @@ -40,7 +40,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/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 8bf0d87..278eaaf 100644 --- a/.lando.yml +++ b/.lando.yml @@ -1,14 +1,24 @@ -name: lando-CHANGEME-plugin +name: docs.varnish +proxy: + cli: + - docs.varnish.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 From e78e70bfc443eaeab2cc35b138a666b46e2c9196 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Mon, 9 Sep 2024 12:13:56 -0700 Subject: [PATCH 2/3] Add newline to config.mjs --- docs/.vitepress/config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vitepress/config.mjs b/docs/.vitepress/config.mjs index 658ffb4..f8ca123 100644 --- a/docs/.vitepress/config.mjs +++ b/docs/.vitepress/config.mjs @@ -53,4 +53,4 @@ function sidebar() { ], }, ]; -}; \ No newline at end of file +}; From dbf5cf4b0175ab6a02faf74f0d5d4e02b0919903 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Wed, 11 Sep 2024 14:44:37 -0700 Subject: [PATCH 3/3] Replace references to core/v3/lando-service.html to core/v3/services/lando.html --- docs/config.md | 6 +++--- docs/index.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/config.md b/docs/config.md index 764b880..cec87fc 100644 --- a/docs/config.md +++ b/docs/config.md @@ -5,9 +5,9 @@ description: Learn how to configure the Lando Varnish 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: @@ -83,7 +83,7 @@ services: There are also [several envvars](https://github.com/wodby/varnish) exposed by the underlying image we use that you can set to further customize how your Varnish works. **These are not officially supported** so we *highly recommend* you do not alter them unless you know what you are doing. Even then, YMMV. -That said, you will need to use a [service override](https://docs.lando.dev/core/v3/lando-service.html#overrides) to take advantage of them as shown below: +That said, you will need to use a [service override](https://docs.lando.dev/core/v3/services/lando.html#overrides) to take advantage of them as shown below: ```yaml myservice: diff --git a/docs/index.md b/docs/index.md index 7f0f8f3..57102f9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,7 +8,7 @@ next: ./config.html [Varnish Cache](https://varnish-cache.org/intro/index.html#intro) is a web application accelerator also known as a caching HTTP reverse proxy. You install it in front of any server that speaks HTTP and configure it to cache the contents. -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: @@ -25,9 +25,9 @@ services: * [6](https://hub.docker.com/r/wodby/varnish) * **[4.1](https://hub.docker.com/r/wodby/varnish)** **(default)** * [4](https://hub.docker.com/r/wodby/varnish) -* [custom](https://docs.lando.dev/core/v3/lando-service.html#overrides) +* [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides) ## Patch versions -This service does not support patch versions but if you **really** need something like that, you could consider using either a [custom compose service](https://docs.lando.dev/plugins/compose) or a service [overrides](https://docs.lando.dev/core/v3/lando-service.html#overrides). +This service does not support patch versions but if you **really** need something like that, you could consider using either a [custom compose service](https://docs.lando.dev/plugins/compose) or a service [overrides](https://docs.lando.dev/core/v3/services/lando.html#overrides).