Skip to content
Snippets Groups Projects
Commit 092cc6be authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

Use Debian/Trixie as base


In order to proceed with the rebase we need stable docker images with all
the needed dependencies available. To do that switch to Debian Bookworm
as mirror.

This same approach was used in fb4c138c (Bookworm) and 788aa27a (Bullseye).

Signed-off-by: default avatarDylan Aïssi <dylan.aissi@collabora.com>
parent 2aa30617
No related branches found
No related tags found
No related merge requests found
...@@ -7,9 +7,9 @@ stages: ...@@ -7,9 +7,9 @@ stages:
- publish images - publish images
variables: variables:
RELEASE: "v2025pre" RELEASE: "trixie"
DISTRO: apertis DISTRO: debian
MIRROR: https://repositories.apertis.org/apertis/ MIRROR: https://deb.debian.org/debian/
STABLE: auto STABLE: auto
TEST_TAG: test-${CI_PIPELINE_ID} TEST_TAG: test-${CI_PIPELINE_ID}
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
FROM scratch FROM scratch
ARG OSNAME=apertis ARG OSNAME=debian
LABEL description="$OSNAME base image" LABEL description="$OSNAME base image"
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
......
{{- $architecture := or .architecture "amd64" }} {{- $architecture := or .architecture "amd64" }}
{{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}} {{- $mirror := or .mirror "https://deb.debian.org/debian/" -}}
{{- $suite := or .suite "v2022dev2" -}} {{- $suite := or .suite "trixie" -}}
{{- $ospack := or .ospack "rootfs.tar.gz" -}} {{- $ospack := or .ospack "rootfs.tar.gz" -}}
{{- $timestamp := or .timestamp "00000000.0" -}} {{- $timestamp := or .timestamp "00000000.0" -}}
{{- $stable := or .stable "" -}} {{- $stable := or .stable "" -}}
{{- $osname := or .osname "apertis" -}} {{- $osname := or .osname "debian" -}}
architecture: {{ $architecture }} architecture: {{ $architecture }}
...@@ -22,15 +22,6 @@ actions: ...@@ -22,15 +22,6 @@ actions:
- action: overlay - action: overlay
source: 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 development sdk
- action: run
chroot: true
script: scripts/replace-gplv2-packages-for-dev-env.sh
- action: run - action: run
description: "Setting up image version metadata" description: "Setting up image version metadata"
chroot: true chroot: true
......
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