diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 910d7fecdb5c2164811701b8e101582c8278c9f4..0380bbb0755ce99ea9cf0e3582f150d68b11b07e 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 a5ac53e1544ce4de047e9c10e861b48407508246..43fcfbaee550646dff879f8396d6d9e5dc77af1d 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 3b84564ed34b807a47d67ef7e0e83a3511cdfc05..3634915b85898768bc8ba62fc5850f29e0435ba2 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