Skip to content

Commit 049dcd4

Browse files
committed
chore: Docker volumes with relative paths
Docker supports using relative path for bind-mounted volumes. So use those rather than PWD. This also makes Makefile more compatible with Windows.
1 parent 3aa1e7a commit 049dcd4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ docker:
9898
docker tag bat-go:$(GIT_VERSION)$(BUILD_TIME) bat-go:latest
9999

100100
docker-reproducible:
101-
docker run -v $(PWD):/workspace --network=host \
101+
docker run -v .:/workspace --network=host \
102102
gcr.io/kaniko-project/executor:latest \
103103
--reproducible --dockerfile /workspace/Dockerfile \
104104
--no-push --tarPath /workspace/bat-go-repro.tar \
@@ -190,11 +190,11 @@ format-lint:
190190
make format && make lint
191191

192192
lint: ensure-gomod-volume
193-
docker run --rm -v "$$(pwd):/app" -v batgo_lint_gomod:/go/pkg --workdir /app/main golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
194-
docker run --rm -v "$$(pwd):/app" -v batgo_lint_gomod:/go/pkg --workdir /app/cmd golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
195-
docker run --rm -v "$$(pwd):/app" -v batgo_lint_gomod:/go/pkg --workdir /app/libs golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
196-
docker run --rm -v "$$(pwd):/app" -v batgo_lint_gomod:/go/pkg --workdir /app/services golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
197-
docker run --rm -v "$$(pwd):/app" -v batgo_lint_gomod:/go/pkg --workdir /app/tools golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
193+
docker run --rm -v ".:/app" -v batgo_lint_gomod:/go/pkg --workdir /app/main golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
194+
docker run --rm -v ".:/app" -v batgo_lint_gomod:/go/pkg --workdir /app/cmd golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
195+
docker run --rm -v ".:/app" -v batgo_lint_gomod:/go/pkg --workdir /app/libs golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
196+
docker run --rm -v ".:/app" -v batgo_lint_gomod:/go/pkg --workdir /app/services golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
197+
docker run --rm -v ".:/app" -v batgo_lint_gomod:/go/pkg --workdir /app/tools golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...
198198

199199
download-mod:
200200
cd ./cmd && go mod download && cd ..

0 commit comments

Comments
 (0)