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 788aa27a.

.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

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

base/rootfs.yaml

 {{- $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