From 092cc6bee9c08f8c312d41c50a4a0d2c5825e50f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dylan=20A=C3=AFssi?= <dylan.aissi@collabora.com>
Date: Mon, 14 Oct 2024 14:57:16 +0200
Subject: [PATCH] Use Debian/Trixie as base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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: Dylan Aïssi <dylan.aissi@collabora.com>
---
.gitlab-ci.yml | 6 +++---
base/Dockerfile | 2 +-
base/rootfs.yaml | 15 +++------------
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9128275..1e1b85e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,9 @@ stages:
- publish images
variables:
- RELEASE: "v2025pre"
- DISTRO: apertis
- MIRROR: https://repositories.apertis.org/apertis/
+ RELEASE: "trixie"
+ DISTRO: debian
+ MIRROR: https://deb.debian.org/debian/
STABLE: auto
TEST_TAG: test-${CI_PIPELINE_ID}
diff --git a/base/Dockerfile b/base/Dockerfile
index a5ac53e..43fcfba 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -18,7 +18,7 @@
FROM scratch
-ARG OSNAME=apertis
+ARG OSNAME=debian
LABEL description="$OSNAME base image"
ENV LANG=C.UTF-8
diff --git a/base/rootfs.yaml b/base/rootfs.yaml
index 2e823c0..e31307c 100644
--- a/base/rootfs.yaml
+++ b/base/rootfs.yaml
@@ -1,10 +1,10 @@
{{- $architecture := or .architecture "amd64" }}
-{{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
-{{- $suite := or .suite "v2022dev2" -}}
+{{- $mirror := or .mirror "https://deb.debian.org/debian/" -}}
+{{- $suite := or .suite "trixie" -}}
{{- $ospack := or .ospack "rootfs.tar.gz" -}}
{{- $timestamp := or .timestamp "00000000.0" -}}
{{- $stable := or .stable "" -}}
-{{- $osname := or .osname "apertis" -}}
+{{- $osname := or .osname "debian" -}}
architecture: {{ $architecture }}
@@ -22,15 +22,6 @@ 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 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