Fix docker sources

ptr727 · Oct 7, 2023 · 5322425 · 5322425
1 parent f30cf20
commit 5322425
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Docker/Arch.Dockerfile b/Docker/Arch.Dockerfile
@@ -60,7 +60,9 @@ RUN ./Build.sh
 
 # Final layer
 # https://hub.docker.com/_/archlinux
-FROM archlinux:latest as final
+# TODO: Switch back to standard image when .NET 8 has been released
+FROM greyltc/archlinux-aur:yay as final
+# FROM archlinux:latest as final
 
 # Image label
 ARG LABEL_VERSION="1.0.0.0"
@@ -87,7 +89,7 @@ ENV LANG=en_US.UTF-8 \
     LANGUAGE=en_US:en \
     LC_ALL=en_US.UTF-8
 
-# TODO: Remove when .NET 8.0 has been releases
+# TODO: Remove when .NET 8.0 has been released
 # https://aur.archlinux.org/packages/dotnet-sdk-preview-bin
 RUN sudo -u ab -D~ bash -c 'yay -Syu --removemake --needed --noprogressbar --noconfirm dotnet-sdk-preview-bin'
 

diff --git a/Docker/Debian.dotNET.Dockerfile b/Docker/Debian.dotNET.Dockerfile
@@ -16,7 +16,7 @@
 
 # Test image in shell:
 # docker run -it --rm --pull always --name Testing mcr.microsoft.com/dotnet/sdk:latest /bin/bash
-# docker run -it --rm --pull always --name Testing mcr.microsoft.com/dotnet/sdk:8.0-preview /bin/bash
+# docker run -it --rm --pull always --name Testing mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim /bin/bash
 # docker run -it --rm --pull always --name Testing ptr727/plexcleaner:debian-develop /bin/bash
 # export DEBIAN_FRONTEND=noninteractive
 
@@ -110,8 +110,8 @@ RUN touch /etc/apt/preferences.d/stable.pref \
     && echo "Package: *" >> /etc/apt/preferences.d/experimental.pref \
     && echo "Pin: release a=experimental" >> /etc/apt/preferences.d/experimental.pref \
     && echo "Pin-Priority: 1" >> /etc/apt/preferences.d/experimental.pref \
-    && cp /etc/apt/sources.list /etc/apt/sources.list.d/stable.list \
-    && mv /etc/apt/sources.list /etc/apt/sources.list.orig \
+    && cp /etc/apt/sources.list.d/debian.sources /etc/apt/sources.list.d/stable.list \
+    && mv /etc/apt/sources.list.d/debian.sources /etc/apt/sources.list.d/debian.sources.orig \
     && touch /etc/apt/sources.list.d/testing.list \
     && echo "deb http://deb.debian.org/debian testing main" >> /etc/apt/sources.list.d/testing.list \
     && touch /etc/apt/sources.list.d/unstable.list \