daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dockerfiles: formatting 

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
master
CrazyMax 2022-07-20 16:44:31 +02:00
parent b066451b40
commit 0e17e54091
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockerfiles/git.Dockerfile
View File

@ -20,4 +20,4 @@ WORKDIR /src
RUN --mount=type=bind,target=. \ RUN --mount=type=bind,target=. \
--mount=type=cache,target=/root/.cache \ --mount=type=cache,target=/root/.cache \
--mount=from=gitvalidation,source=/out/git-validation,target=/usr/bin/git-validation \ --mount=from=gitvalidation,source=/out/git-validation,target=/usr/bin/git-validation \
git-validation -q -range "$COMMIT_RANGE" -run short-subject,dangling-whitespace git-validation -q -range "${COMMIT_RANGE}" -run short-subject,dangling-whitespace

26
dockerfiles/vendor.Dockerfile
View File

@ -12,12 +12,12 @@ FROM base AS vendored
RUN --mount=target=/context \ RUN --mount=target=/context \
--mount=target=.,type=tmpfs \ --mount=target=.,type=tmpfs \
--mount=target=/go/pkg/mod,type=cache <<EOT --mount=target=/go/pkg/mod,type=cache <<EOT
set -e set -e
rsync -a /context/. . rsync -a /context/. .
go mod tidy go mod tidy
go mod vendor go mod vendor
mkdir /out mkdir /out
cp -r go.mod go.sum vendor /out cp -r go.mod go.sum vendor /out
EOT EOT
FROM scratch AS update FROM scratch AS update
@ -26,16 +26,16 @@ COPY --from=vendored /out /out
FROM vendored AS validate FROM vendored AS validate
RUN --mount=target=/context \ RUN --mount=target=/context \
--mount=target=.,type=tmpfs <<EOT --mount=target=.,type=tmpfs <<EOT
set -e set -e
rsync -a /context/. . rsync -a /context/. .
git add -A git add -A
rm -rf vendor rm -rf vendor
cp -rf /out/* . cp -rf /out/* .
if [ -n "$(git status --porcelain -- go.mod go.sum vendor)" ]; then if [ -n "$(git status --porcelain -- go.mod go.sum vendor)" ]; then
echo >&2 'ERROR: Vendor result differs. Please vendor your package with "make vendor"' echo >&2 'ERROR: Vendor result differs. Please vendor your package with "make vendor"'
git status --porcelain -- go.mod go.sum vendor git status --porcelain -- go.mod go.sum vendor
exit 1 exit 1
fi fi
EOT EOT
FROM psampaz/go-mod-outdated:${MODOUTDATED_VERSION} AS go-mod-outdated FROM psampaz/go-mod-outdated:${MODOUTDATED_VERSION} AS go-mod-outdated