Skip to content

Commit e6cd957

Browse files
authored
Merge pull request #1219 from spack/prune-v3
Set up v3 buildcache pruner
2 parents c16f005 + 1ee673a commit e6cd957

File tree

14 files changed

+314
-1081
lines changed

14 files changed

+314
-1081
lines changed

.github/images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ images:
3333
image: ghcr.io/spack/django:0.5.14
3434

3535
- path: ./images/ci-prune-buildcache
36-
image: ghcr.io/spack/ci-prune-buildcache:0.0.4
36+
image: ghcr.io/spack/ci-prune-buildcache:0.0.5
3737

3838
- path: ./images/protected-publish
3939
image: ghcr.io/spack/protected-publish:0.0.9
Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
1-
FROM fedora:40
1+
FROM python:3.14-slim
22

33
WORKDIR /app/
44

5-
# python dependencies
6-
COPY requirements.txt /app/setup/requirements.txt
7-
COPY setup.sh /app/setup/setup.sh
8-
RUN /app/setup/setup.sh
5+
# Install system dependencies
6+
RUN apt-get update && apt-get install -y --no-install-recommends \
7+
git \
8+
jq \
9+
&& rm -rf /var/lib/apt/lists/*
10+
11+
# Don't write .pyc files to disk
12+
ENV PYTHONDONTWRITEBYTECODE=1
13+
# Don't buffer Python output
14+
ENV PYTHONUNBUFFERED=1
15+
16+
# Install Python dependencies
17+
COPY requirements.txt ./
18+
RUN pip install --no-cache-dir -r requirements.txt
919

10-
# Install pruning app
11-
COPY __init__.py ./
12-
COPY ci_buildcache_prune.py ./
13-
COPY pruner.py ./
14-
COPY buildcache.py ./
15-
COPY helper.py ./
1620
COPY entrypoint.sh ./
21+
COPY fetch_keeplist.py ./
22+
COPY prune.py ./
1723

18-
WORKDIR /work/
24+
WORKDIR /app/
1925

20-
ENTRYPOINT [ "bash", "/app/entrypoint.sh"]
26+
ENTRYPOINT [ "bash", "/app/entrypoint.sh" ]

images/ci-prune-buildcache/__init__.py

Whitespace-only changes.

images/ci-prune-buildcache/buildcache.py

Lines changed: 0 additions & 194 deletions
This file was deleted.

0 commit comments

Comments
 (0)