From 5e87c7427d34213a0e67a65a3f125fc541c4ac6c Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Wed, 8 May 2019 21:05:01 +0100 Subject: [PATCH] ci: Copy in a new sources.list if given Signed-off-by: Simon McVittie <smcv@collabora.com> --- ci/Dockerfile.in | 1 + ci/Jenkinsfile | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ci/Dockerfile.in b/ci/Dockerfile.in index 440ad72e6..f9613f342 100644 --- a/ci/Dockerfile.in +++ b/ci/Dockerfile.in @@ -1,3 +1,4 @@ FROM @BASE_IMAGE@ +COPY sources.list /etc/apt/sources.list.d/pressure-vessel.list RUN apt-get update # vim:set sw=4 sts=4 et ft=dockerfile: diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index 39da68754..3d0876a0b 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -68,6 +68,11 @@ pipeline { sh """ sed -e 's!@BASE_IMAGE@!${env.CI_DOCKER_REGISTRY}/${env.CI_DOCKER_IMAGE}!g' < src/ci/Dockerfile.in > src/ci/Dockerfile + if [ -n "${env.CI_APT_SOURCES_FILE}" ]; then + cp "${env.CI_APT_SOURCES_FILE}" src/ci/sources.list + else + touch src/ci/sources.list + fi """ docker.withRegistry("https://${env.CI_DOCKER_REGISTRY}", dockerRegistryCred) { -- GitLab