Skip to content
Snippets Groups Projects
Commit 4957d117 authored by Ujwal Kundur's avatar Ujwal Kundur
Browse files

Test Fix 6.2 

Add apt lock timeouts to prevent builder and oneapi stages from
clashing.
parent 1516cd1d
No related branches found
No related tags found
1 merge request!306OneAPI Integration Testing
Hide whitespace changes
Inline Side-by-side
containers/oneapi/onedev.Dockerfile
+ 9
− 9
View file @ 4957d117
...@@ -15,14 +15,14 @@ ARG INTERNAL_TAG="unstable-mr-290-306" ...@@ -15,14 +15,14 @@ ARG INTERNAL_TAG="unstable-mr-290-306"
FROM ${DOCKER_REGISTRY}debian_stable_base:${INTERNAL_TAG} as builder FROM ${DOCKER_REGISTRY}debian_stable_base:${INTERNAL_TAG} as builder
## Install some extra spack dependencies ## Install some extra spack dependencies
RUN --mount=type=cache,target=/var/cache/apt \ RUN --mount=type=cache,target=/var/cache/apt \
rm -f /etc/apt/apt.conf.d/docker-clean \ rm -f /etc/apt/apt.conf.d/docker-clean \
&& apt-get -yqq update \ && apt-get -yqq update \
&& apt-get -yqq install --no-install-recommends \ && apt-get -yqq install --no-install-recommends -o DPkg::Lock::Timeout=-1 \
python3 \ python3 \
python3-dev \ python3-dev \
python3-distutils \ python3-distutils \
python-is-python3 \ python-is-python3 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
...@@ -249,7 +249,7 @@ RUN --mount=type=cache,target=/var/cache/apt \ ...@@ -249,7 +249,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
&& echo "US/Eastern" > /etc/timezone \ && echo "US/Eastern" > /etc/timezone \
&& apt-get -yqq update \ && apt-get -yqq update \
&& apt-get -yqq upgrade \ && apt-get -yqq upgrade \
&& apt-get -yqq install --no-install-recommends \ && apt-get -yqq install --no-install-recommends -o DPkg::Lock::Timeout=-1\
bc \ bc \
ca-certificates \ ca-certificates \
clang-format \ clang-format \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment