From 1a9a5fa6b5644528a77c662d62bbe01c6e216eac Mon Sep 17 00:00:00 2001 From: lub Date: Sat, 21 Dec 2019 08:06:02 +0100 Subject: [PATCH] copy sources.list instead of generating them --- config/etc/apt/sources.list | 0 .../apt/sources.list.d/debian-security.list | 1 + config/etc/apt/sources.list.d/debian.list | 1 + config/etc/apt/sources.list.d/docker.list | 1 + .../share/keyrings/docker-archive-keyring.gpg | Bin 0 -> 2982 bytes docker.key | 62 ------------------ post-debootstrap-installer.sh | 12 ++-- 7 files changed, 7 insertions(+), 70 deletions(-) create mode 100644 config/etc/apt/sources.list create mode 100644 config/etc/apt/sources.list.d/debian-security.list create mode 100644 config/etc/apt/sources.list.d/debian.list create mode 100644 config/etc/apt/sources.list.d/docker.list create mode 100644 config/usr/share/keyrings/docker-archive-keyring.gpg delete mode 100644 docker.key diff --git a/config/etc/apt/sources.list b/config/etc/apt/sources.list new file mode 100644 index 0000000..e69de29 diff --git a/config/etc/apt/sources.list.d/debian-security.list b/config/etc/apt/sources.list.d/debian-security.list new file mode 100644 index 0000000..eaf168c --- /dev/null +++ b/config/etc/apt/sources.list.d/debian-security.list @@ -0,0 +1 @@ +deb https://deb.debian.org/debian-security buster/updates main contrib non-free \ No newline at end of file diff --git a/config/etc/apt/sources.list.d/debian.list b/config/etc/apt/sources.list.d/debian.list new file mode 100644 index 0000000..51e438c --- /dev/null +++ b/config/etc/apt/sources.list.d/debian.list @@ -0,0 +1 @@ +deb https://deb.debian.org/debian buster main contrib non-free \ No newline at end of file diff --git a/config/etc/apt/sources.list.d/docker.list b/config/etc/apt/sources.list.d/docker.list new file mode 100644 index 0000000..552bcfd --- /dev/null +++ b/config/etc/apt/sources.list.d/docker.list @@ -0,0 +1 @@ +deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian buster stable \ No newline at end of file diff --git a/config/usr/share/keyrings/docker-archive-keyring.gpg b/config/usr/share/keyrings/docker-archive-keyring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..b8d738c1c1d633c1f2b8cd538c75cc89fcc48516 GIT binary patch literal 2982 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 literal 0 HcmV?d00001 diff --git a/docker.key b/docker.key deleted file mode 100644 index ee7872e..0000000 --- a/docker.key +++ /dev/null @@ -1,62 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -YT90qFF93M3v01BbxP+EIY2/9tiIPbrd -=0YYh ------END PGP PUBLIC KEY BLOCK----- diff --git a/post-debootstrap-installer.sh b/post-debootstrap-installer.sh index 25dcedc..d1793d1 100755 --- a/post-debootstrap-installer.sh +++ b/post-debootstrap-installer.sh @@ -4,6 +4,10 @@ set -e # config files cp -a /hardware-setup/config/* / +# update apt because sources.list.d is also in config/* +apt-get update +apt-get dist-upgrade + # locales @@ -59,14 +63,6 @@ done ### Docker -# add docker key -apt-get -y install gnupg2 -apt-key add /hardware-setup/docker.key -apt-get -y --purge autoremove gnupg2 - -echo 'deb https://download.docker.com/linux/debian buster stable' > /etc/apt/sources.list.d/docker.list -apt-get update - apt-get -y install docker-ce