From ac306de8cbf91f8ac9e48ef1da99e8250093df17 Mon Sep 17 00:00:00 2001
From: Ujwal Kundur <ujwal.kundur@gmail.com>
Date: Wed, 22 Jun 2022 19:29:34 +0530
Subject: [PATCH] Test fix 6.4
Disable cache mounts for builder apt commands.
---
containers/oneapi/onedev.Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index 12a323937..3061b7932 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -15,10 +15,11 @@ 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 \
+## Do not use Cache mount as it conflicts with oneapi stage
+RUN \
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 \
+ && apt-get -yqq install --no-install-recommends \
python3 \
python3-dev \
python3-distutils \
@@ -247,7 +248,6 @@ RUN --mount=type=cache,target=/var/cache/apt \
rm -f /etc/apt/apt.conf.d/docker-clean \
&& ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime \
&& echo "US/Eastern" > /etc/timezone \
- && echo ps \
&& apt-get -yqq update \
&& apt-get -yqq upgrade \
&& apt-get -yqq install --no-install-recommends \
--
GitLab