Merge pull request #43 from crazy-max/update-workflow

dev: update workflow
This commit is contained in:
CrazyMax 2021-11-16 22:27:34 +01:00 committed by GitHub
commit 10348241d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 37 deletions

View File

@ -31,6 +31,7 @@ target "build-validate" {
inherits = ["node-version"] inherits = ["node-version"]
dockerfile = "./hack/build.Dockerfile" dockerfile = "./hack/build.Dockerfile"
target = "build-validate" target = "build-validate"
output = ["type=cacheonly"]
} }
target "format" { target "format" {
@ -44,17 +45,19 @@ target "format-validate" {
inherits = ["node-version"] inherits = ["node-version"]
dockerfile = "./hack/build.Dockerfile" dockerfile = "./hack/build.Dockerfile"
target = "format-validate" target = "format-validate"
output = ["type=cacheonly"]
} }
target "vendor-update" { target "vendor-update" {
inherits = ["node-version"] inherits = ["node-version"]
dockerfile = "./hack/vendor.Dockerfile" dockerfile = "./hack/build.Dockerfile"
target = "update" target = "vendor-update"
output = ["."] output = ["."]
} }
target "vendor-validate" { target "vendor-validate" {
inherits = ["node-version"] inherits = ["node-version"]
dockerfile = "./hack/vendor.Dockerfile" dockerfile = "./hack/build.Dockerfile"
target = "validate" target = "vendor-validate"
output = ["type=cacheonly"]
} }

View File

@ -1,4 +1,5 @@
# syntax=docker/dockerfile:1.2 # syntax=docker/dockerfile:1.3-labs
ARG NODE_VERSION ARG NODE_VERSION
FROM node:${NODE_VERSION}-alpine AS base FROM node:${NODE_VERSION}-alpine AS base
@ -8,7 +9,22 @@ WORKDIR /src
FROM base AS deps FROM base AS deps
RUN --mount=type=bind,target=.,rw \ RUN --mount=type=bind,target=.,rw \
--mount=type=cache,target=/src/node_modules \ --mount=type=cache,target=/src/node_modules \
yarn install yarn install && mkdir /vendor && cp yarn.lock /vendor
FROM scratch AS vendor-update
COPY --from=deps /vendor /
FROM deps AS vendor-validate
RUN --mount=type=bind,target=.,rw <<EOT
set -e
git add -A
cp -rf /vendor/* .
if [ -n "$(git status --porcelain -- yarn.lock)" ]; then
echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor-update"'
git status --porcelain -- yarn.lock
exit 1
fi
EOT
FROM deps AS build FROM deps AS build
RUN --mount=type=bind,target=.,rw \ RUN --mount=type=bind,target=.,rw \
@ -19,13 +35,16 @@ FROM scratch AS build-update
COPY --from=build /out / COPY --from=build /out /
FROM build AS build-validate FROM build AS build-validate
RUN --mount=type=bind,target=.,rw \ RUN --mount=type=bind,target=.,rw <<EOT
git add -A && cp -rf /out/* .; \ set -e
if [ -n "$(git status --porcelain -- dist)" ]; then \ git add -A
echo >&2 'ERROR: Build result differs. Please build first with "docker buildx bake build"'; \ cp -rf /out/* .
git status --porcelain -- dist; \ if [ -n "$(git status --porcelain -- dist)" ]; then
exit 1; \ echo >&2 'ERROR: Build result differs. Please build first with "docker buildx bake build"'
fi git status --porcelain -- dist
exit 1
fi
EOT
FROM deps AS format FROM deps AS format
RUN --mount=type=bind,target=.,rw \ RUN --mount=type=bind,target=.,rw \
@ -39,4 +58,4 @@ COPY --from=format /out /
FROM deps AS format-validate FROM deps AS format-validate
RUN --mount=type=bind,target=.,rw \ RUN --mount=type=bind,target=.,rw \
--mount=type=cache,target=/src/node_modules \ --mount=type=cache,target=/src/node_modules \
yarn run format-check \ yarn run format-check

View File

@ -1,23 +0,0 @@
# syntax=docker/dockerfile:1.2
ARG NODE_VERSION
FROM node:${NODE_VERSION}-alpine AS base
RUN apk add --no-cache git
WORKDIR /src
FROM base AS vendored
RUN --mount=type=bind,target=.,rw \
--mount=type=cache,target=/src/node_modules \
yarn install && mkdir /out && cp yarn.lock /out
FROM scratch AS update
COPY --from=vendored /out /
FROM vendored AS validate
RUN --mount=type=bind,target=.,rw \
git add -A && cp -rf /out/* .; \
if [ -n "$(git status --porcelain -- yarn.lock)" ]; then \
echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor-update"'; \
git status --porcelain -- yarn.lock; \
exit 1; \
fi