Skip to content

Commit b67fb9b

Browse files
committed
Fix race condition in entrypoint.sh by replacing awk with bash arithmetic, and fix Dockerfile indentation
1 parent fbe4d12 commit b67fb9b

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

build/base/entrypoint.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ function resolve_host() {
1717
echo "Couldn't resolve $host"
1818
return
1919
fi
20+
echo "Couldn't resolve $host. Sleeping ${backoff}s before retry..."
2021
sleep $backoff
21-
echo "Couldn't resolve $host... Retrying"
22+
echo "Retrying resolution of $host..."
2223
((counter++))
23-
backoff=$(echo - | awk "{print $backoff + $backoff}")
24+
backoff=$((backoff + backoff))
2425
done
2526
echo "Resolved $host"
2627
}

build/base/intel-builder.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ RUN apt update \
1616
&& echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg trusted=yes] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \
1717
&& apt update \
1818
&& apt install -y --no-install-recommends \
19-
libstdc++-12-dev binutils procps clang \
20-
intel-oneapi-compiler-dpcpp-cpp \
21-
intel-oneapi-mpi-devel-2021.14 \
19+
libstdc++-12-dev binutils procps clang \
20+
intel-oneapi-compiler-dpcpp-cpp \
21+
intel-oneapi-mpi-devel-2021.14 \
2222
&& apt remove -y gnupg2 ca-certificates apt-transport-https \
2323
&& apt autoremove -y \
2424
&& rm -rf /var/lib/apt/lists/*

build/base/intel.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ RUN apt update \
1818
&& echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg trusted=yes] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \
1919
&& apt update \
2020
&& apt install -y --no-install-recommends \
21-
dnsutils \
22-
intel-oneapi-mpi-2021.14 \
21+
dnsutils \
22+
intel-oneapi-mpi-2021.14 \
2323
&& apt remove -y gnupg2 ca-certificates \
2424
&& apt autoremove -y \
2525
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)