From f1559f4af3c33b1485b2dffee75c0770b32c7c92 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Fri, 23 Apr 2021 12:03:45 +0200
Subject: [PATCH] Switch back to using Apertis as the base image
Now that the bulk of the packages have been made available in the
Bullseye based v2022dev2 we can revert
commit 788aa27aef9144a8bd2ab2f25fb7702955a40931.
---
.gitlab-ci.yml | 4 +---
base/Dockerfile | 4 ++--
base/rootfs.yaml | 17 +++++++++++++----
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05bc514..b740a02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
variables:
RELEASE: "v2022dev2"
DISTRO: apertis
- MIRROR: https://deb.debian.org/debian/
+ MIRROR: https://repositories.apertis.org/apertis/
STABLE: auto
TEST_TAG: test-${CI_PIPELINE_ID}
@@ -57,8 +57,6 @@ build-base-rootfs:
only:
- branches
script:
- - DISTRO=debian RELEASE=bullseye
- - echo "Hack DISTRO=$DISTRO and RELEASE=$RELEASE until we can build real Apertis v2022dev2 images"
- >
cd base &&
debos -t osname:${DISTRO} -t suite:${RELEASE} -t stable:$STABLE -t mirror:"$MIRROR" rootfs.yaml
diff --git a/base/Dockerfile b/base/Dockerfile
index 2e37000..a5ac53e 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -18,7 +18,7 @@
FROM scratch
-ARG OSNAME=debian
+ARG OSNAME=apertis
LABEL description="$OSNAME base image"
ENV LANG=C.UTF-8
@@ -30,4 +30,4 @@ ARG OSPACK=rootfs.tar.gz
ADD ${OSPACK} /
# Always install procps in case the docker file gets used in jenkins
-RUN apt-get update && apt-get install --no-install-recommends -y procps debian-archive-keyring
+RUN apt-get update && apt-get install --no-install-recommends -y procps
diff --git a/base/rootfs.yaml b/base/rootfs.yaml
index 4fd8c01..cbbdb6d 100644
--- a/base/rootfs.yaml
+++ b/base/rootfs.yaml
@@ -1,10 +1,10 @@
{{- $architecture := or .architecture "amd64" }}
-{{- $mirror := or .mirror "https://deb.debian.org/debian/" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
+{{- $suite := or .suite "v2022dev2" -}}
{{- $ospack := or .ospack "rootfs.tar.gz" -}}
{{- $timestamp := or .timestamp "00000000.0" -}}
{{- $stable := or .stable "" -}}
-{{- $osname := or .osname "debian" -}}
+{{- $osname := or .osname "apertis" -}}
architecture: {{ $architecture }}
@@ -12,7 +12,7 @@ actions:
- action: debootstrap
suite: {{ $suite }}
components:
- - main
+ - target
mirror: {{ $mirror }}
variant: minbase
keyring-package: {{ $osname }}-archive-keyring
@@ -22,6 +22,15 @@ actions:
- action: overlay
source: overlay
+ - action: run
+ description: "Add extra apt sources"
+ chroot: true
+ script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} --sources {{if eq $stable "true"}} --updates --security {{end}} target hmi development sdk
+
+ - action: run
+ chroot: true
+ script: scripts/replace-gplv2-packages-for-dev-env.sh
+
- action: run
description: "Setting up image version metadata"
chroot: true
--
GitLab