From c1e1ca777d43f451e22c4c8bb120f37df3e36fb3 Mon Sep 17 00:00:00 2001 From: Emanuele Aina <emanuele.aina@collabora.com> Date: Fri, 13 Nov 2020 15:03:22 +0100 Subject: [PATCH] base: Rename the ospack file to a neutral "rootfs" Downstreams need to figure out what is specific to Apertis and needs to be customized, so let's not mislead them and drop "apertis" from the rootfs intermediate artifact as it does not need any customization since it's purely internal to the pipeline. Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com> --- base/Dockerfile | 2 +- base/rootfs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 178cb09..7edc7c0 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -25,7 +25,7 @@ ENV LC_ALL=C.UTF-8 ARG DEBIAN_FRONTEND=noninteractive -ARG OSPACK=apertis.tar.gz +ARG OSPACK=rootfs.tar.gz ADD ${OSPACK} / # Always install procps in case the docker file gets used in jenkins diff --git a/base/rootfs.yaml b/base/rootfs.yaml index ff9251d..a49376f 100644 --- a/base/rootfs.yaml +++ b/base/rootfs.yaml @@ -1,7 +1,7 @@ {{- $architecture := or .architecture "amd64" }} {{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}} {{- $suite := or .suite "v2020dev0" -}} -{{- $ospack := or .ospack "apertis.tar.gz" -}} +{{- $ospack := or .ospack "rootfs.tar.gz" -}} {{- $timestamp := or .timestamp "00000000.0" -}} {{- $stable := or .stable "" -}} -- GitLab