improve script compatibility (#4132)
This commit is contained in:
+1
-1
@@ -6,5 +6,5 @@ export DOCKERFILE_APIDOCS_GEN
|
||||
|
||||
apidocs:
|
||||
echo "$$DOCKERFILE_APIDOCS_GEN" | docker build . -f - -t temp
|
||||
docker run --rm -v "$(PWD)/apidocs:/s" -w /s temp \
|
||||
docker run --rm -v "$(shell pwd)/apidocs:/s" -w /s temp \
|
||||
sh -c "redoc-cli bundle openapi.yaml"
|
||||
|
||||
+1
-1
@@ -6,5 +6,5 @@ export DOCKERFILE_FORMAT
|
||||
|
||||
format:
|
||||
echo "$$DOCKERFILE_FORMAT" | docker build -q . -f - -t temp
|
||||
docker run --rm -it -v "$(PWD):/s" -w /s temp \
|
||||
docker run --rm -it -v "$(shell pwd):/s" -w /s temp \
|
||||
sh -c "gofumpt -l -w ."
|
||||
|
||||
+2
-2
@@ -5,7 +5,7 @@ endef
|
||||
export DOCKERFILE_APIDOCS_LINT
|
||||
|
||||
lint-golangci:
|
||||
docker run --rm -v "$(PWD):/app" -w /app \
|
||||
docker run --rm -v "$(shell pwd):/app" -w /app \
|
||||
$(LINT_IMAGE) \
|
||||
golangci-lint run -v
|
||||
|
||||
@@ -15,7 +15,7 @@ lint-mod-tidy:
|
||||
|
||||
lint-apidocs:
|
||||
echo "$$DOCKERFILE_APIDOCS_LINT" | docker build . -f - -t temp
|
||||
docker run --rm -v "$(PWD)/apidocs:/s" -w /s temp \
|
||||
docker run --rm -v "$(shell pwd)/apidocs:/s" -w /s temp \
|
||||
sh -c "openapi lint openapi.yaml"
|
||||
|
||||
lint: lint-golangci lint-mod-tidy lint-apidocs
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
mod-tidy:
|
||||
docker run --rm -it -v "$(PWD):/s" -w /s $(BASE_IMAGE) \
|
||||
docker run --rm -it -v "$(shell pwd):/s" -w /s $(BASE_IMAGE) \
|
||||
sh -c "apk add git && GOPROXY=direct go mod tidy"
|
||||
|
||||
+2
-2
@@ -25,13 +25,13 @@ export DOCKERFILE_TEST
|
||||
test:
|
||||
echo "$$DOCKERFILE_TEST" | docker build -q . -f - -t temp --build-arg ARCH=amd64
|
||||
docker run --rm \
|
||||
-v "$(PWD):/s" \
|
||||
-v "$(shell pwd):/s" \
|
||||
temp \
|
||||
make test-nodocker
|
||||
|
||||
test32:
|
||||
echo "$$DOCKERFILE_TEST" | docker build -q . -f - -t temp --build-arg ARCH=i386
|
||||
docker run --rm \
|
||||
-v "$(PWD):/s" \
|
||||
-v "$(shell pwd):/s" \
|
||||
temp \
|
||||
make test-nodocker
|
||||
|
||||
Reference in New Issue
Block a user