beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #45115 from vvoland/update-shfmt

Browse source 
Dockerfile: Update shfmt to 3.6.0
This commit is contained in:
Brian Goff 2023-03-07 21:23:46 +00:00 committed by GitHub
commit 0bcdbbeedc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -237,7 +237,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
&& /build/gotestsum --version && /build/gotestsum --version
FROM base AS shfmt FROM base AS shfmt
ARG SHFMT_VERSION=v3.0.2 ARG SHFMT_VERSION=v3.6.0
RUN --mount=type=cache,target=/root/.cache/go-build \ RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/go/pkg/mod \
GOBIN=/build/ GO111MODULE=on go install "mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}" \ GOBIN=/build/ GO111MODULE=on go install "mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}" \

4
contrib/dockerize-disk.sh
View file

@ -103,8 +103,8 @@ cat > $builddir/result/$new_image_id/json <<- EOS
EOS EOS
if [ -n "$docker_base_image" ]; then if [ -n "$docker_base_image" ]; then
image_id=$(docker inspect -f "{{.Id}}" "$docker_base_image") image_id=$(docker inspect -f "{{.Id}}" "$docker_base_image")
echo ", \"parent\": \"$image_id\"" >> $builddir/result/$new_image_id/json echo ", \"parent\": \"$image_id\"" >> $builddir/result/$new_image_id/json
fi fi
echo "}" >> $builddir/result/$new_image_id/json echo "}" >> $builddir/result/$new_image_id/json