Skip to content

Commit

Permalink
Fix toolset-build folder name
Browse files Browse the repository at this point in the history
  • Loading branch information
yixinglu committed Oct 30, 2021
1 parent 5622930 commit 174d1cd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
*.out
*.app

build

!docker/*/build
# build
# !docker/*/build
docker/*/build/*-packages
docker/*/build/*-build

*.tar.xz
2 changes: 1 addition & 1 deletion docker/build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ oss_endpoint := $(shell [[ -f $$HOME/.ossutilconfig ]] && sed 's;^endpoint=(.*);
oss_id := $(shell [[ -f $$HOME/.ossutilconfig ]] && sed 's;^accessKeyID=(.*);\1;p' -rn $$HOME/.ossutilconfig)
oss_secret := $(shell [[ -f $$HOME/.ossutilconfig ]] && sed 's;^accessKeySecret=(.*);\1;p' -rn $$HOME/.ossutilconfig)

docker_cmd := docker run -v $$PWD/toolset-packages:/data
docker_cmd := docker run -v $$PWD/toolset-build:/data
ifneq ($(oss_endpoint),)
docker_cmd += -e OSS_ENDPOINT=$(oss_endpoint) -e OSS_ID=$(oss_id) -e OSS_SECRET=$(oss_secret)
endif
Expand Down

0 comments on commit 174d1cd

Please sign in to comment.