[docker-images] Remove repositories included in droidian-apt-config

Signed-off-by: Eugenio Paolantonio (g7) <[email protected]>

Dockerfile.amd64_droidian_build_essential_bullseye

@@ -37,4 +37,7 @@ RUN apt-get update && apt-get install -y --allow-downgrades \
  rsync \
  releng-tools \
  droidian-apt-config \
- droidian-archive-keyring && apt-get dist-upgrade -y --allow-downgrades
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get dist-upgrade -y --allow-downgrades

Dockerfile.amd64_droidian_build_essential_pm_bullseye

@@ -39,4 +39,7 @@ RUN apt-get update && apt-get install -y --allow-downgrades \
  droidian-apt-config \
  droidian-apt-config-plasma \
  debian-pm-archive-keyring \
- droidian-archive-keyring && apt-get dist-upgrade -y --allow-downgrades
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get dist-upgrade -y --allow-downgrades

Dockerfile.amd64_droidian_rootfs_builder_bullseye

@@ -22,7 +22,11 @@ COPY common/apt.conf.d/* /etc/apt/apt.conf.d/
 
 # Update and install
 RUN apt-get update && apt-get install -y \
- droidian-apt-config && apt-get install -y \
+ droidian-apt-config \
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get install -y \
  debos \
  dpkg-dev \
  parted \

Dockerfile.arm64_droidian_build_essential_bullseye

@@ -37,4 +37,7 @@ RUN apt-get update && apt-get install -y --allow-downgrades \
  rsync \
  releng-tools \
  droidian-apt-config \
- droidian-archive-keyring && apt-get dist-upgrade -y --allow-downgrades
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get dist-upgrade -y --allow-downgrades

Dockerfile.arm64_droidian_build_essential_pm_bullseye

@@ -39,4 +39,7 @@ RUN apt-get update && apt-get install -y --allow-downgrades \
  droidian-apt-config \
  droidian-apt-config-plasma \
  debian-pm-archive-keyring \
- droidian-archive-keyring && apt-get dist-upgrade -y --allow-downgrades
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get dist-upgrade -y --allow-downgrades

Dockerfile.arm64_droidian_rootfs_builder_bullseye

@@ -22,7 +22,11 @@ COPY common/apt.conf.d/* /etc/apt/apt.conf.d/
 
 # Update and install
 RUN apt-get update && apt-get install -y \
- droidian-apt-config && apt-get install -y \
+ droidian-apt-config \
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get install -y \
  debos \
  dpkg-dev \
  parted \

Dockerfile.armhf_droidian_build_essential_bullseye

@@ -37,4 +37,7 @@ RUN apt-get update && apt-get install -y --allow-downgrades \
  rsync \
  releng-tools \
  droidian-apt-config \
- droidian-archive-keyring && apt-get dist-upgrade -y --allow-downgrades
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get dist-upgrade -y --allow-downgrades

Dockerfile.armhf_droidian_build_essential_pm_bullseye

@@ -39,4 +39,7 @@ RUN apt-get update && apt-get install -y --allow-downgrades \
  droidian-apt-config \
  droidian-apt-config-plasma \
  debian-pm-archive-keyring \
- droidian-archive-keyring && apt-get dist-upgrade -y --allow-downgrades
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get dist-upgrade -y --allow-downgrades

Dockerfile.armhf_droidian_rootfs_builder_bullseye

@@ -22,7 +22,11 @@ COPY common/apt.conf.d/* /etc/apt/apt.conf.d/
 
 # Update and install
 RUN apt-get update && apt-get install -y \
- droidian-apt-config && apt-get install -y \
+ droidian-apt-config \
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get install -y \
  debos \
  dpkg-dev \
  parted \

Dockerfile.build-essential-pm.in

@@ -39,4 +39,7 @@ RUN apt-get update && apt-get install -y --allow-downgrades \
  droidian-apt-config \
  droidian-apt-config-plasma \
  debian-pm-archive-keyring \
- droidian-archive-keyring && apt-get dist-upgrade -y --allow-downgrades
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get dist-upgrade -y --allow-downgrades

Dockerfile.build-essential.in

@@ -37,4 +37,7 @@ RUN apt-get update && apt-get install -y --allow-downgrades \
  rsync \
  releng-tools \
  droidian-apt-config \
- droidian-archive-keyring && apt-get dist-upgrade -y --allow-downgrades
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get dist-upgrade -y --allow-downgrades

Dockerfile.rootfs-builder.in

@@ -22,7 +22,11 @@ COPY common/apt.conf.d/* /etc/apt/apt.conf.d/
 
 # Update and install
 RUN apt-get update && apt-get install -y \
- droidian-apt-config && apt-get install -y \
+ droidian-apt-config \
+ droidian-archive-keyring \
+ mobian-archive-keyring && \
+ rm -f /etc/apt/sources.list.d/hybris-mobian.list /etc/apt/sources.list.d/mobian.list && \
+ apt-get install -y \
  debos \
  dpkg-dev \
  parted \