Skip to content

Commit

Permalink
fix certs test and assess impact of upsteam.appMount removal
Browse files Browse the repository at this point in the history
  • Loading branch information
pirog committed Sep 16, 2024
1 parent 09a31de commit ce64496
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 5 deletions.
9 changes: 5 additions & 4 deletions builders/lando-v4.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ const write = require('../utils/write-file');
const toPosixPath = require('../utils/to-posix-path');

const states = {APP: 'UNBUILT'};
const stages = {
app: 'Commands to build an application.',
workers: 'Background processes for whatever else?',
};
const groups = {
'boot': {
description: 'Required packages that every subsequent group needs',
Expand Down Expand Up @@ -236,9 +240,6 @@ module.exports = {
// consolidate user info with any incoming stuff
const user = merge({}, {gid, uid, name: username}, require('../utils/parse-v4-user')(config.user));

// add some upstream stuff and legacy stuff
// @NOTE: does this actually do something?
upstream.appMount = config['app-mount'].destination;
// this will change but for right now i just need the image stuff to passthrough
upstream.config = {image: config.image, ports: config.ports};
// make sure we also pass the user
Expand All @@ -252,7 +253,7 @@ module.exports = {
};

// get this
super(id, merge({}, {groups}, {states}, upstream), app, lando);
super(id, merge({}, {stages}, {groups}, {states}, upstream), app, lando);

// props
this.canExec = true;
Expand Down
2 changes: 1 addition & 1 deletion examples/certs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ lando exec web4 -- cat /etc/lando/certs/cert.crt
lando exec web4 -- cat /etc/lando/certs/cert.key

# Should not generate certs if certs is disable-y
lando exec web5 -- ls -lsa /etc/lando/certs || echo $? | grep 1
lando exec web5 -- ls -lsa /etc/lando/certs || echo $? | grep 2

# Should have the correct cert issuer
lando certinfo | grep Issuer | grep "Lando Development CA"
Expand Down
32 changes: 32 additions & 0 deletions examples/mounts/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Mounts Example

This example exists primarily to test the following documentation:

* [Lando 4 Service Mounts](TBD)

See the [Landofiles](https://docs.lando.dev/config/lando.html) in this directory for the exact magicks.

## Start up tests

```bash
# Should start successfully
lando poweroff
lando start
```

## Verification commands

Run the following commands to verify things work as expected

```bash
# Should test something
skip
```

## Destroy tests

```bash
# Should destroy and poweroff
lando destroy -y
lando poweroff
```

0 comments on commit ce64496

Please sign in to comment.