ci: fix cache misses (#1053)
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
diff --git a/images/barbican/Dockerfile b/images/barbican/Dockerfile
index 046f67e..243df60 100644
--- a/images/barbican/Dockerfile
+++ b/images/barbican/Dockerfile
@@ -5,10 +5,7 @@
FROM openstack-venv-builder AS build
COPY --from=barbican --link /src /src/barbican
-ARG TARGETARCH
-ARG TARGETVARIANT
-RUN \
- --mount=type=cache,id=pip-$TARGETARCH$TARGETVARIANT-$RELEASE-cache,sharing=locked,target=/root/.cache/pip <<EOF bash -xe
+RUN <<EOF bash -xe
pip3 install \
--constraint /upper-constraints.txt \
/src/barbican \
diff --git a/images/openstack-runtime/Dockerfile b/images/openstack-runtime/Dockerfile
index 2df606c..732761d 100644
--- a/images/openstack-runtime/Dockerfile
+++ b/images/openstack-runtime/Dockerfile
@@ -1,10 +1,5 @@
FROM ubuntu-cloud-archive
-ARG TARGETARCH
-ARG TARGETVARIANT
-ARG RELEASE
-RUN \
- --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT-$RELEASE-var-cache-apt,sharing=locked,target=/var/cache/apt \
- --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT-$RELEASE-var-lib-apt-lists,sharing=locked,target=/var/lib/apt/lists <<EOF bash -xe
+RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
ca-certificates \
diff --git a/images/openstack-venv-builder/Dockerfile b/images/openstack-venv-builder/Dockerfile
index 4ceb97f..7fea169 100644
--- a/images/openstack-venv-builder/Dockerfile
+++ b/images/openstack-venv-builder/Dockerfile
@@ -1,10 +1,5 @@
FROM ubuntu-cloud-archive
-ARG TARGETARCH
-ARG TARGETVARIANT
-ARG RELEASE
-RUN \
- --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT-$RELEASE-var-cache-apt,sharing=locked,target=/var/cache/apt \
- --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT-$RELEASE-var-lib-apt-lists,sharing=locked,target=/var/lib/apt/lists <<EOF bash -xe
+RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
build-essential \
@@ -20,14 +15,12 @@
python3-pip \
python3-venv
EOF
-RUN \
- --mount=type=cache,id=pip-$TARGETARCH$TARGETVARIANT-$RELEASE-cache,sharing=locked,target=/root/.cache/pip <<EOF bash -xe
+RUN <<EOF bash -xe
python3 -m venv --upgrade-deps --system-site-packages /var/lib/openstack
EOF
ENV PATH=/var/lib/openstack/bin:$PATH
COPY --link --from=requirements /src/upper-constraints.txt /upper-constraints.txt
-RUN \
- --mount=type=cache,id=pip-$TARGETARCH$TARGETVARIANT-$RELEASE-cache,sharing=locked,target=/root/.cache/pip <<EOF bash -xe
+RUN <<EOF bash -xe
pip3 install \
--constraint /upper-constraints.txt \
cryptography \
diff --git a/images/requirements/Dockerfile b/images/requirements/Dockerfile
index fe201f0..1ba9f82 100644
--- a/images/requirements/Dockerfile
+++ b/images/requirements/Dockerfile
@@ -1,9 +1,5 @@
FROM ubuntu
-ARG TARGETARCH
-ARG TARGETVARIANT
-RUN \
- --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT-var-cache-apt,sharing=locked,target=/var/cache/apt \
- --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT-var-lib-apt-lists,sharing=locked,target=/var/lib/apt/lists <<EOF bash -xe
+RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends ca-certificates git
EOF
diff --git a/images/ubuntu/Dockerfile b/images/ubuntu/Dockerfile
index 46a9164..d776231 100644
--- a/images/ubuntu/Dockerfile
+++ b/images/ubuntu/Dockerfile
@@ -1,16 +1,2 @@
FROM ubuntu
LABEL org.opencontainers.image.source=https://github.com/vexxhost/atmosphere
-RUN <<EOF
-rm -f /etc/apt/apt.conf.d/docker-clean
-echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
-EOF
-
-# ARG TARGETARCH
-# ARG TARGETVARIANT
-# RUN \
-# --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT-var-cache-apt,sharing=locked,target=/var/cache/apt \
-# --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT-var-lib-apt-lists,sharing=locked,target=/var/lib/apt/lists <<EOF bash -xe
-# apt-get update -qq
-# apt-get install -qq -y --no-install-recommends \
-# # CVE-XXXX
-# EOF