Skip to content
Snippets Groups Projects
Commit dcfb39d3 authored by Simon McVittie's avatar Simon McVittie
Browse files

CI: Use debian:bullseye-slim instead of our own legacy Docker image


steamos/package-builder:bullseye contained a random selection of
packages' build-dependencies. Use a more minimal image instead.

Helps: steamrt/tasks#248
Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 62d43f53
No related branches found
No related tags found
1 merge request!542CI improvements
This commit is part of merge request !542. Comments created here will be created in the context of that merge request.
......@@ -474,14 +474,7 @@ deploy:
- subprojects/container-runtime/depots/*.txt
- subprojects/container-runtime/depots/*/VERSIONS.txt
test-populate-depot:debian-11:
extends: .test-populate-depot
image: docker.internal.steamos.cloud/steamos/package-builder:bullseye
# The same, but for Ubuntu 18.04
test-populate-depot:ubuntu-18.04:
extends: .test-populate-depot
image: ubuntu:18.04
.test-populate-depot:deb:
before_script:
- |
set -eux
......@@ -494,11 +487,20 @@ test-populate-depot:ubuntu-18.04:
perl \
python3 \
python3-debian \
xz-utils \
${NULL+}
tempdir="$(mktemp -d)"
git clone --branch steamrt/soldier https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.steamos.cloud/packaging/python-vdf.git "$tempdir/python-vdf"
export PYTHONPATH="$tempdir/python-vdf"
test-populate-depot:debian-11:
extends: .test-populate-depot:deb
image: debian:bullseye-slim
test-populate-depot:ubuntu-18.04:
extends: .test-populate-depot:deb
image: ubuntu:18.04
# The same, but for Arch
test-populate-depot:archlinux:
extends: .test-populate-depot
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment