From 4957d11768fef3b91fffe8e63636e48b1187ff4d Mon Sep 17 00:00:00 2001
From: Ujwal Kundur <ujwal.kundur@gmail.com>
Date: Wed, 22 Jun 2022 19:17:32 +0530
Subject: [PATCH] Test Fix 6.2
Add apt lock timeouts to prevent builder and oneapi stages from
clashing.
---
containers/oneapi/onedev.Dockerfile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index 12391b7bc..1b7c8cc2d 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -15,14 +15,14 @@ ARG INTERNAL_TAG="unstable-mr-290-306"
FROM ${DOCKER_REGISTRY}debian_stable_base:${INTERNAL_TAG} as builder
## Install some extra spack dependencies
-RUN --mount=type=cache,target=/var/cache/apt \
- rm -f /etc/apt/apt.conf.d/docker-clean \
- && apt-get -yqq update \
- && apt-get -yqq install --no-install-recommends \
- python3 \
- python3-dev \
- python3-distutils \
- python-is-python3 \
+RUN --mount=type=cache,target=/var/cache/apt \
+ rm -f /etc/apt/apt.conf.d/docker-clean \
+ && apt-get -yqq update \
+ && apt-get -yqq install --no-install-recommends -o DPkg::Lock::Timeout=-1 \
+ python3 \
+ python3-dev \
+ python3-distutils \
+ python-is-python3 \
&& rm -rf /var/lib/apt/lists/*
@@ -249,7 +249,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
&& echo "US/Eastern" > /etc/timezone \
&& apt-get -yqq update \
&& apt-get -yqq upgrade \
- && apt-get -yqq install --no-install-recommends \
+ && apt-get -yqq install --no-install-recommends -o DPkg::Lock::Timeout=-1\
bc \
ca-certificates \
clang-format \
--
GitLab