Merge pull request #706 from Savvythelegend/chore/fix-dockerfile-lint

chore(docker): fix casing of AS keyword to resolve linter warnings

Author: leecalcote

Dockerfile

@@ -1,63 +1,63 @@
 ARG GO_VERSION=1.21
 ARG HTMLTEST_VERSION=0.17.0
 
-FROM golang:${GO_VERSION}-alpine as base
+FROM golang:${GO_VERSION}-alpine AS base
 WORKDIR /src
 RUN apk --update add nodejs npm git gcompat
 
-FROM base as node
+FROM base AS node
 COPY package*.json .
 ENV NODE_ENV=production
 RUN npm install
 
-FROM base as hugo
+FROM base AS hugo
 ARG HUGO_VERSION=0.122.0
 ARG TARGETARCH
 WORKDIR /tmp/hugo
 RUN wget -O "hugo.tar.gz" "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${TARGETARCH}.tar.gz"
 RUN tar -xf "hugo.tar.gz" hugo
 
-FROM base as build-base
+FROM base AS build-base
 COPY --from=hugo /tmp/hugo/hugo /bin/hugo
 COPY --from=node /src/node_modules /src/node_modules
 COPY . .
 
-FROM build-base as dev
+FROM build-base AS dev
 
-FROM build-base as build
+FROM build-base AS build
 ARG HUGO_ENV
 ARG DOCS_URL
 RUN hugo --gc --minify -d /out -e $HUGO_ENV -b $DOCS_URL
 
-FROM scratch as release
+FROM scratch AS release
 COPY --from=build /out /
 
-FROM scratch as update-stats
+FROM scratch AS update-stats
 COPY --from=build /src/hugo_stats.json /hugo_stats.json
 
-FROM build as validate-stats
+FROM build AS validate-stats
 RUN <<EOF
 if [ -n "$(git status --porcelain -- hugo_stats.json)" ]; then
   echo >&2 'ERROR: hugo_stats.json differs. Update with `docker buildx bake update-stats`'
   exit 1
 fi
 EOF
 
-FROM davidanson/markdownlint-cli2:v0.12.1 as lint
+FROM davidanson/markdownlint-cli2:v0.12.1 AS lint
 USER root
 RUN --mount=type=bind,target=. \
     /usr/local/bin/markdownlint-cli2 \
     "content/**/*.md" \
     "#content/engine/release-notes/*.md" \
     "#content/desktop/previous-versions/*.md"
 
-FROM wjdp/htmltest:v${HTMLTEST_VERSION} as test
+FROM wjdp/htmltest:v${HTMLTEST_VERSION} AS test
 WORKDIR /test
 COPY --from=build /out ./public
 ADD .htmltest.yml .htmltest.yml
 RUN htmltest
 
-FROM build-base as update-modules
+FROM build-base AS update-modules
 ARG MODULE
 RUN <<"EOT"
 set -ex
@@ -71,21 +71,21 @@ fi
 EOT
 RUN hugo mod vendor
 
-FROM scratch as vendor
+FROM scratch AS vendor
 COPY --from=update-modules /src/_vendor /_vendor
 COPY --from=update-modules /src/go.* /
 
-FROM build-base as build-upstream
+FROM build-base AS build-upstream
 ARG UPSTREAM_MODULE_NAME
 ARG UPSTREAM_REPO
 ARG UPSTREAM_COMMIT
 ENV HUGO_MODULE_REPLACEMENTS="github.com/${UPSTREAM_MODULE_NAME} -> github.com/${UPSTREAM_REPO} ${UPSTREAM_COMMIT}"
 RUN hugo --ignoreVendorPaths "github.com/${UPSTREAM_MODULE_NAME}" -d /out
 
-FROM wjdp/htmltest:v${HTMLTEST_VERSION} as validate-upstream
+FROM wjdp/htmltest:v${HTMLTEST_VERSION} AS validate-upstream
 WORKDIR /test
 COPY --from=build-upstream /out ./public
 ADD .htmltest.yml .htmltest.yml
 RUN htmltest
 
-FROM dev
+FROM dev

SECURITY.md

@@ -1,6 +1,6 @@
 # Security Policy
-We are very grateful to the security researchers and users that report
-back Layer5 project security vulnerabilities. We investigate every report thoroughly.
+We are very grateful to the security researchers and users who report
+Layer5 project security vulnerabilities. We investigate every report thoroughly.
 
 ## Reporting a vulnerability
 To make a report, send an email to the private
@@ -16,36 +16,36 @@ Send us a report whenever you:
 - Think Layer5 projects have a potential security vulnerability.
 - Are unsure whether or how a vulnerability affects Layer5 projects.
 - Think a vulnerability is present in another project that Layer5 projects
-depend on (Docker for example).
+depend on (Docker, for example).
 
 ### When not to report a security vulnerability?
 
 Don't send a vulnerability report if:
 
 - You need help tuning Layer5 project components for security.
-- You need help applying security related updates.
-- Your issue is not security related.
+- You need help applying security-related updates.
+- Your issue is not security-related.
 
 ## Evaluation
 
 The Layer5 team acknowledges and analyzes each vulnerability report within 10 working days.
 
 Any vulnerability information you share with the Layer5 team stays
-within the Layer5 project. We don't disseminate the information to other
+within the Layer5 project. We do not disseminate the information to other
 projects. We only share the information as needed to fix the issue.
 
-We keep the reporter updated as the status of the security issue is addressed.
+We keep the reporter updated on the status of the security issue as it is addressed.
 
 ## Fixing the issue
 
 Once a security vulnerability has been fully characterized, a fix is developed by the Layer5 team.
-The development and testing for the fix happens in a private GitHub repository in order to prevent
+The development and testing for the fix happen in a private GitHub repository in order to prevent
 premature disclosure of the vulnerability.
 
 ## Early disclosure
 
 The Layer5 team maintains a mailing list for private early disclosure of security vulnerabilities. 
-The list is used to provide actionable information to close Layer5 partners. The list is not intended 
+The list is used to provide actionable information to trusted Layer5 partners. The list is not intended 
 for individuals to find out about security issues.
 
 ## Public disclosure
@@ -54,11 +54,11 @@ On the day chosen for public disclosure, a sequence of activities takes place as
 
 - Changes are merged from the private GitHub repository holding the fix into the appropriate set of public
 branches.
-- Layer5 team ensures all necessary binaries are promptly built and published.
+- The Layer5 team ensures all necessary binaries are promptly built and published.
 - Once the binaries are available, an announcement is sent out on the following channels:
   - The [Layer5 blog](https://layer5.io/blog/)
   - The [Layer5 Twitter feed](https://twitter.com/layer5)
   - The #announcements channel on Slack
 
-As much as possible this announcement will be actionable, and include any mitigating steps customers can take prior to
-upgrading to a fixed version. 
+As much as possible, this announcement will be actionable and include any mitigating steps customers can take prior to
+upgrading to a fixed version.