Skip to content

Commit 429e17e

Browse files
authored
Merge branch 'master' into update-sharing-visibility
2 parents 1af0f1d + 88269e0 commit 429e17e

File tree

14 files changed

+294
-87
lines changed

14 files changed

+294
-87
lines changed

Dockerfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
11
ARG GO_VERSION=1.21
22
ARG HTMLTEST_VERSION=0.17.0
33

4-
FROM golang:${GO_VERSION}-alpine as base
4+
FROM golang:${GO_VERSION}-alpine AS base
55
WORKDIR /src
66
RUN apk --update add nodejs npm git gcompat
77

8-
FROM base as node
8+
FROM base AS node
99
COPY package*.json .
1010
ENV NODE_ENV=production
1111
RUN npm install
1212

13-
FROM base as hugo
13+
FROM base AS hugo
1414
ARG HUGO_VERSION=0.122.0
1515
ARG TARGETARCH
1616
WORKDIR /tmp/hugo
1717
RUN wget -O "hugo.tar.gz" "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${TARGETARCH}.tar.gz"
1818
RUN tar -xf "hugo.tar.gz" hugo
1919

20-
FROM base as build-base
20+
FROM base AS build-base
2121
COPY --from=hugo /tmp/hugo/hugo /bin/hugo
2222
COPY --from=node /src/node_modules /src/node_modules
2323
COPY . .
2424

25-
FROM build-base as dev
25+
FROM build-base AS dev
2626

27-
FROM build-base as build
27+
FROM build-base AS build
2828
ARG HUGO_ENV
2929
ARG DOCS_URL
3030
RUN hugo --gc --minify -d /out -e $HUGO_ENV -b $DOCS_URL
3131

32-
FROM scratch as release
32+
FROM scratch AS release
3333
COPY --from=build /out /
3434

35-
FROM scratch as update-stats
35+
FROM scratch AS update-stats
3636
COPY --from=build /src/hugo_stats.json /hugo_stats.json
3737

38-
FROM build as validate-stats
38+
FROM build AS validate-stats
3939
RUN <<EOF
4040
if [ -n "$(git status --porcelain -- hugo_stats.json)" ]; then
4141
echo >&2 'ERROR: hugo_stats.json differs. Update with `docker buildx bake update-stats`'
4242
exit 1
4343
fi
4444
EOF
4545

46-
FROM davidanson/markdownlint-cli2:v0.12.1 as lint
46+
FROM davidanson/markdownlint-cli2:v0.12.1 AS lint
4747
USER root
4848
RUN --mount=type=bind,target=. \
4949
/usr/local/bin/markdownlint-cli2 \
5050
"content/**/*.md" \
5151
"#content/engine/release-notes/*.md" \
5252
"#content/desktop/previous-versions/*.md"
5353

54-
FROM wjdp/htmltest:v${HTMLTEST_VERSION} as test
54+
FROM wjdp/htmltest:v${HTMLTEST_VERSION} AS test
5555
WORKDIR /test
5656
COPY --from=build /out ./public
5757
ADD .htmltest.yml .htmltest.yml
5858
RUN htmltest
5959

60-
FROM build-base as update-modules
60+
FROM build-base AS update-modules
6161
ARG MODULE
6262
RUN <<"EOT"
6363
set -ex
@@ -71,21 +71,21 @@ fi
7171
EOT
7272
RUN hugo mod vendor
7373

74-
FROM scratch as vendor
74+
FROM scratch AS vendor
7575
COPY --from=update-modules /src/_vendor /_vendor
7676
COPY --from=update-modules /src/go.* /
7777

78-
FROM build-base as build-upstream
78+
FROM build-base AS build-upstream
7979
ARG UPSTREAM_MODULE_NAME
8080
ARG UPSTREAM_REPO
8181
ARG UPSTREAM_COMMIT
8282
ENV HUGO_MODULE_REPLACEMENTS="github.com/${UPSTREAM_MODULE_NAME} -> github.com/${UPSTREAM_REPO} ${UPSTREAM_COMMIT}"
8383
RUN hugo --ignoreVendorPaths "github.com/${UPSTREAM_MODULE_NAME}" -d /out
8484

85-
FROM wjdp/htmltest:v${HTMLTEST_VERSION} as validate-upstream
85+
FROM wjdp/htmltest:v${HTMLTEST_VERSION} AS validate-upstream
8686
WORKDIR /test
8787
COPY --from=build-upstream /out ./public
8888
ADD .htmltest.yml .htmltest.yml
8989
RUN htmltest
9090

91-
FROM dev
91+
FROM dev

README.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ Running the site locally is simple. Provided you have Docker installed, clone th
5555
5656
### With Golang
5757

58-
If your local development environment has a supported version (v1.21.0+) of Golang installed, next you'll need to install extended hugo version as it has necessary SCSS/SASS support. Find all the hugo packages here: <https://github.com/gohugoio/hugo/releases/tag/v0.120.4>
58+
If your local development environment has a supported version (v1.21.0+) of Golang installed, next you'll need to install extended Hugo version as it has necessary SCSS/SASS support. Find all the Hugo packages here: <https://github.com/gohugoio/hugo/releases/tag/v0.120.4>
5959

6060
Now to setup and run the site locally run:
6161

6262
`make setup` followed by `make site`
6363

6464
...and then visit <http://localhost:1313>.
6565

66-
If you pull down new code from GitHub, you will occasionally need run `make setup` again. Otherwise, there's no need to re-run `make setup` each time the site is run, you can just run `make site` to get it going and have it automatically reload as you make and save site edits.
66+
If you pull down new code from GitHub, you will occasionally need to run `make setup` again. Otherwise, there's no need to re-run `make setup` each time the site is run, you can just run `make site` to get it going and have it automatically reload as you make and save site edits.
6767

68-
## Layer5 Documentation Stucture
68+
## Layer5 Documentation Structure
6969

7070
## High-Level Outline & Information Architecture for Layer5 Documentation
7171

@@ -81,7 +81,7 @@ If you pull down new code from GitHub, you will occasionally need run `make setu
8181
### Getting Started
8282

8383
- **Setting up Layer5 Account:** With a personal account on Layer5 Cloud, you can import or create infrastructural designs, collaborate with others through workspaces and teams, manage your organizations and more.
84-
- **Creating a Design from Meshery Catalog Templates:** With this guide, you can create amazing cloud native designs for your infrastructure from already avaliable templetes in the meshery catalog.
84+
- **Creating a Design from Meshery Catalog Templates:** With this guide, you can create amazing cloud native designs for your infrastructure from already available templates in the meshery catalog.
8585

8686
### Concepts
8787

@@ -129,13 +129,13 @@ Low-level ReST API reference for extending Layer5 Cloud.
129129
- **Starting from a pattern:** A Pattern is an entity that augments the operational behavior of a deployed instance of a Design.
130130
- **Creating Relationships:** Relationships identify and facilitate genealogy between Components.
131131
- **Working with Components:** Components represent entities in the Meshery ecosystem, exposing capabilities of the underlying platform.
132-
- **Starting from scratch:** Emphasiz the underlying system behavior for each action you take.
132+
- **Starting from scratch:** Emphasize the underlying system behavior for each action you take.
133133

134134
### Exploring Designer
135135

136136
- **Reviewing Designs:** Learn how to leverage comments in Kanvas’s Designer Mode to enhance collaboration and streamline design reviews.
137-
- **Whiteboarding:** Whiteboarding and Freestyle Drawing inside kanvas
138-
- **Export Designs:** How to export your designs for backup , sharing or offline use.
137+
- **Whiteboarding:** Whiteboarding and Freestyle Drawing inside Kanvas
138+
- **Export Designs:** How to export your designs for backup, sharing or offline use.
139139

140140
### Working with Components
141141

@@ -195,7 +195,7 @@ To display images in a pop-up modal, use the following syntax: `![alt text](/pat
195195

196196
### Adding Alert to the site
197197

198-
Use the following Syntax to add a Alert:
198+
Use the following Syntax to add an Alert:
199199
`{{< alert type="success" title="Note" >}} Your Note {{< /alert >}}`
200200

201201
- `type="danger"`: Alert used to indicate something related to security.
@@ -204,21 +204,23 @@ Use the following Syntax to add a Alert:
204204
- `type="note"`: Alert used to indicate a neutral information.
205205
- `type="success"`: Alert used to indicate a positive information.
206206

207-
By default, if you don't specify a title `title="Your Title"`, the title will be the same as the type name.
207+
By default, if you don't specify a `title="Your Title"`, the title will be the same as the type name.
208208

209-
**Note-> Using the wrong type will lead to the use of the default alert i.e. success**
209+
**Note-> Using an invalid alert type will lead to the default alert being used (i.e. success).**
210210

211211
<hr/>
212212

213213
<a name="contributing"></a><a name="community"></a>
214-
Our projects are community-built and welcome collaboration. 👍 Be sure to see the <a href="https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit">Layer5 Community Welcome Guide</a> for a tour of resources available to you and jump into our <a href="http://slack.layer5.io">Slack</a>!
214+
Our projects are community-driven and open to collaboration. 👍 Be sure to see the <a href="https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit">Layer5 Community Welcome Guide</a> for a tour of resources available to you. You can also join our <a href="http://slack.layer5.io">Slack</a> to get involved.
215215

216216
<p style="clear:both;">
217217
<a href ="https://layer5.io/community/meshmates"><img alt="MeshMates" src=".github/readme/images/layer5-community-sign.png" style="margin-right:10px; margin-bottom:15px;" width="28%" align="left"/></a>
218218
<h3>Find your MeshMate</h3>
219219

220-
<p>MeshMates are experienced Layer5 community members, who will help you learn your way around, discover live projects and expand your community network.
221-
Become a <b>Meshtee</b> today!</p>
220+
<p>
221+
MeshMates are experienced Layer5 community members who will help you learn your way around, discover live projects and expand your community network.
222+
Become a <b>Meshtee</b> today!
223+
</p>
222224

223225
Find out more on the <a href="https://layer5.io/community">Layer5 community</a>. <br />
224226
<br /><br /><br /><br />
@@ -237,7 +239,7 @@ Find out more on the <a href="https://layer5.io/community">Layer5 community</a>.
237239
<div>
238240
<a href="https://meshery.io/community"><img alt="Layer5 Community" src=".github/readme/images//community.svg" style="margin-right:8px;padding-top:9px;" width="140px" align="left" /></a>
239241
<p>
240-
✔️ <em><strong>Join</strong></em> any or all of the weekly meetings on <a href="https://calendar.google.com/calendar/b/1?cid=bGF5ZXI1LmlvX2VoMmFhOWRwZjFnNDBlbHZvYzc2MmpucGhzQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20">community calendar</a>.<br />
242+
✔️ <em><strong>Join</strong></em> any or all of the weekly meetings on <a href="https://calendar.google.com/calendar/b/1?cid=bGF5ZXI1LmlvX2VoMmFhOWRwZjFnNDBlbHZvYzc2MmpucGhzQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20">Community calendar</a>.<br />
241243
✔️ <em><strong>Watch</strong></em> community <a href="https://www.youtube.com/playlist?list=PL3A-A6hPO2IMPPqVjuzgqNU5xwnFFn3n0">meeting recordings</a>.<br />
242244
✔️ <em><strong>Access</strong></em> the <a href="https://drive.google.com/drive/u/4/folders/0ABH8aabN4WAKUk9PVA">Community Drive</a> by completing a community <a href="https://layer5.io/newcomer">Member Form</a>.<br />
243245
✔️ <em><strong>Discuss</strong></em> in the <a href="https://discuss.layer5.io">Community Forum</a>.<br />

SECURITY.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Security Policy
2-
We are very grateful to the security researchers and users that report
3-
back Layer5 project security vulnerabilities. We investigate every report thoroughly.
2+
We are very grateful to the security researchers and users who report
3+
Layer5 project security vulnerabilities. We investigate every report thoroughly.
44

55
## Reporting a vulnerability
66
To make a report, send an email to the private
@@ -16,36 +16,36 @@ Send us a report whenever you:
1616
- Think Layer5 projects have a potential security vulnerability.
1717
- Are unsure whether or how a vulnerability affects Layer5 projects.
1818
- Think a vulnerability is present in another project that Layer5 projects
19-
depend on (Docker for example).
19+
depend on (Docker, for example).
2020

2121
### When not to report a security vulnerability?
2222

2323
Don't send a vulnerability report if:
2424

2525
- You need help tuning Layer5 project components for security.
26-
- You need help applying security related updates.
27-
- Your issue is not security related.
26+
- You need help applying security-related updates.
27+
- Your issue is not security-related.
2828

2929
## Evaluation
3030

3131
The Layer5 team acknowledges and analyzes each vulnerability report within 10 working days.
3232

3333
Any vulnerability information you share with the Layer5 team stays
34-
within the Layer5 project. We don't disseminate the information to other
34+
within the Layer5 project. We do not disseminate the information to other
3535
projects. We only share the information as needed to fix the issue.
3636

37-
We keep the reporter updated as the status of the security issue is addressed.
37+
We keep the reporter updated on the status of the security issue as it is addressed.
3838

3939
## Fixing the issue
4040

4141
Once a security vulnerability has been fully characterized, a fix is developed by the Layer5 team.
42-
The development and testing for the fix happens in a private GitHub repository in order to prevent
42+
The development and testing for the fix happen in a private GitHub repository in order to prevent
4343
premature disclosure of the vulnerability.
4444

4545
## Early disclosure
4646

4747
The Layer5 team maintains a mailing list for private early disclosure of security vulnerabilities.
48-
The list is used to provide actionable information to close Layer5 partners. The list is not intended
48+
The list is used to provide actionable information to trusted Layer5 partners. The list is not intended
4949
for individuals to find out about security issues.
5050

5151
## Public disclosure
@@ -54,11 +54,11 @@ On the day chosen for public disclosure, a sequence of activities takes place as
5454

5555
- Changes are merged from the private GitHub repository holding the fix into the appropriate set of public
5656
branches.
57-
- Layer5 team ensures all necessary binaries are promptly built and published.
57+
- The Layer5 team ensures all necessary binaries are promptly built and published.
5858
- Once the binaries are available, an announcement is sent out on the following channels:
5959
- The [Layer5 blog](https://layer5.io/blog/)
6060
- The [Layer5 Twitter feed](https://twitter.com/layer5)
6161
- The #announcements channel on Slack
6262

63-
As much as possible this announcement will be actionable, and include any mitigating steps customers can take prior to
64-
upgrading to a fixed version.
63+
As much as possible, this announcement will be actionable and include any mitigating steps customers can take prior to
64+
upgrading to a fixed version.

assets/scss/_styles_project.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ body {
128128
.md__image img,
129129
img.md-image-responsive {
130130
display: block;
131-
width: 100%;
131+
width: auto;
132132
max-width: clamp(320px, 100%, 700px);
133133
height: auto;
134134
margin: 0 auto;

build/meshery-extensions.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.8.121-1
1+
v0.8.122-1

charts/index.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ entries:
4949
layer5-cloud:
5050
- apiVersion: v2
5151
appVersion: v0.8.310
52-
created: "2025-07-22T09:01:53.679592506Z"
52+
created: "2025-07-22T11:35:53.646830128Z"
5353
dependencies:
5454
- condition: kratos.enabled
5555
name: kratos
@@ -60,7 +60,7 @@ entries:
6060
repository: '@ory'
6161
version: 0.24.2
6262
description: Layer5 Cloud is a collection of services that can be deployed on-premises.
63-
digest: 54b4fe51ae1bdb0274152957005499258590c422ddf736ebd32229fcdb5a0215
63+
digest: 55f64a26c7298e4170137edecf9c3f066f29a7e8c9ef41971a1c72a7a5783ec0
6464
icon: data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNDEuNzMgMTQxLjczIj48dGl0bGU+NS1saWdodC1iZzwvdGl0bGU+PHJlY3QgaWQ9Il9QYXRoXyIgZGF0YS1uYW1lPSImbHQ7UGF0aCZndDsiIHg9Ijc5LjYzIiB5PSIyMy45NyIgd2lkdGg9IjM2LjkzIiBoZWlnaHQ9IjE3Ljc5IiBzdHlsZT0iZmlsbDojMDBiMzlmIi8+PHBhdGggaWQ9Il9QYXRoXzIiIGRhdGEtbmFtZT0iJmx0O1BhdGgmZ3Q7IiBkPSJNMTE5LjkyLDgzLjlWNzYuNTNjMC04LjQ5LTcuMTQtMTUuMzctMTUuOTQtMTUuMzdINDQuMzhWNTYuMzFIMjIuNTZ2MjFIOTguMVY4My45WiIgc3R5bGU9ImZpbGw6IzAwYjM5ZiIvPjxwb2x5Z29uIGlkPSJfUGF0aF8zIiBkYXRhLW5hbWU9IiZsdDtQYXRoJmd0OyIgcG9pbnRzPSI0NC4zOCA1MC41IDQ0LjM4IDQxLjc2IDczLjYgNDEuNzYgNzMuNiAyMy45NyAyMi41NiAyMy45NyAyMi41NiA1MC41IDQ0LjM4IDUwLjUiIHN0eWxlPSJmaWxsOiMwMGQzYTkiLz48cGF0aCBpZD0iX1BhdGhfNCIgZGF0YS1uYW1lPSImbHQ7UGF0aCZndDsiIGQ9Ik05OC4xLDg5LjYyVjEwMEg2OC44OHYxNy43OWgzNmExNC43NywxNC43NywwLDAsMCwxNS0xNC40OVY4OS42MloiIHN0eWxlPSJmaWxsOiMwMGQzYTkiLz48cGF0aCBpZD0iX1BhdGhfNSIgZGF0YS1uYW1lPSImbHQ7UGF0aCZndDsiIGQ9Ik00Mi42Myw5MC41OFYxMDBINjIuODV2MTcuNzloLTI2YTE0Ljc3LDE0Ljc3LDAsMCwxLTE1LTE0LjQ5VjkwLjU4WiIgc3R5bGU9ImZpbGw6IzAwYjM5ZiIvPjwvc3ZnPg==
6565
name: layer5-cloud
6666
type: application
@@ -1247,4 +1247,4 @@ entries:
12471247
urls:
12481248
- https://docs.layer5.io/charts/layer5-cloud-v0.8.235.tgz
12491249
version: v0.8.235
1250-
generated: "2025-07-22T09:01:53.674573552Z"
1250+
generated: "2025-07-22T11:35:53.64023914Z"

charts/layer5-cloud-v0.8.310.tgz

1 Byte
Binary file not shown.

content/en/cloud/academy/creating-your-learning-path/images/embedded-design-academy-content-publishing-workflow.js

Lines changed: 150 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)