From 788aa27aef9144a8bd2ab2f25fb7702955a40931 Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>
Date: Wed, 24 Feb 2021 20:02:36 +0530
Subject: [PATCH] Debian commits
---
.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 910d7fe..0380bbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,9 +6,9 @@ stages:
- publish images
variables:
- RELEASE: "v2022dev1"
- DISTRO: apertis
- MIRROR: https://repositories.apertis.org/apertis/
+ RELEASE: "bullseye"
+ 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 3b84564..3634915 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 "v2020dev0" -}}
+{{- $mirror := or .mirror "https://deb.debian.org/debian/" -}}
+{{- $suite := or .suite "bullseye" -}}
{{- $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 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