Skip to content

Commit d38698d

Browse files
committed
Revert "docker: Lock image build"
This reverts commit f2066af.
1 parent f2066af commit d38698d

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

docker/linux.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,8 @@ function print_help() {
139139
function build_container() {
140140
log_group_begin "Building image $image_name"
141141

142-
local ndk_version=$(cat ndk-version.txt)
143-
144-
flock --exclusive docker/Dockerfile.linux \
145-
docker $(docker_host) build \
146-
--tag $image_name \
147-
--file docker/Dockerfile.linux \
148-
--build-arg NDK_VERSION=$ndk_version \
149-
docker
142+
ndk_version=$(cat ndk-version.txt)
143+
dock build -t $image_name --build-arg NDK_VERSION=$ndk_version - < docker/Dockerfile.linux
150144

151145
log_group_end
152146
}

docker/utils.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,14 @@ function check_dependency {
2424
command -v $dep >/dev/null 2>&1 || { error "'$dep' is not installed"; }
2525
}
2626

27-
function docker_host() {
27+
function dock() {
2828
if [ -n "$host" ]; then
29-
echo -n "--host ssh://$host"
29+
docker --host ssh://$host "$@"
30+
else
31+
docker "$@"
3032
fi
3133
}
3234

33-
function dock() {
34-
docker $(docker_host) "$@"
35-
}
36-
3735
function exe() (
3836
local opts=
3937
local history_log=

0 commit comments

Comments
 (0)