Commit d3d332a1 authored by nimrod's avatar nimrod
Browse files

toolbx: Update the APT keyring handling. 

- Use the asc format instead of the gpg DB. APT starts ignoring these
  files with the warnings that this is an unsupported filetype.
- Move them to /etc/apt/keyrings while I was at it. It's the new proper
  place for them.
parent 21eef42b

toolbx/Dockerfile

+8 −15
Original line number Diff line number Diff line
@@ -24,21 +24,14 @@ RUN rm /etc/apt/apt.conf.d/docker-* && \ 
    && \

    export GNUPGHOME=/tmp/gnupghome && \

    mkdir --mode=0700 "$GNUPGHOME" && \

    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \

    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/google-cloud.gpg && \

    curl https://pgp.mongodb.com/server-5.0.asc | \

    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/mongodb.gpg && \

    curl https://apt.releases.hashicorp.com/gpg | \

    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/hashicorp.gpg && \

    curl https://dl.cloudsmith.io/public/cloudposse/packages/gpg.7333C6FDEFA717CC.key | \

    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/cloudposse.gpg && \

    curl https://repo.charm.sh/apt/gpg.key | \

    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/charm.gpg && \

    curl https://packages.opentofu.org/opentofu/tofu/gpgkey | \

    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/opentofu.gpg && \

    curl https://download.docker.com/linux/debian/gpg | \

    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/docker.gpg && \

    gpg --no-default-keyring --keyring /usr/share/keyrings/clickhouse.gpg --keyserver hkp://keyserver.ubuntu.com:80  --recv-keys 8919F6BD2B48D754 && \

    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg  --output /etc/apt/keyrings/google-cloud.asc && \

    curl https://pgp.mongodb.com/server-5.0.asc --output /etc/apt/keyrings/mongodb.asc && \

    curl https://apt.releases.hashicorp.com/gpg --output /etc/apt/keyrings/hashicorp.asc && \

    curl https://dl.cloudsmith.io/public/cloudposse/packages/gpg.7333C6FDEFA717CC.key --output /etc/apt/keyrings/cloudposse.asc && \

    curl https://repo.charm.sh/apt/gpg.key --output /etc/apt/keyrings/charm.asc && \

    curl https://packages.opentofu.org/opentofu/tofu/gpgkey --output /etc/apt/keyrings/opentofu.asc && \

    curl https://download.docker.com/linux/debian/gpg --output /etc/apt/keyrings/docker.asc && \

    curl https://packages.clickhouse.com/rpm/lts/repodata/repomd.xml.key --output /etc/apt/keyrings/clickhouse.asc && \

    ln --symbolic --target /usr/local/bin/ /usr/libexec/flatpak-xdg-utils/* && \

    ln --symbolic /usr/local/bin/host-spawn /usr/local/bin/podman && \

    #mkdir /etc/krb5.conf.d && \

toolbx/sources.d/charm.sources

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ Types: deb 
URIs:https://repo.charm.sh/apt/

Suites: *

Components: *

Signed-By: /usr/share/keyrings/charm.gpg
 
Signed-By: /etc/apt/keyrings/charm.asc

toolbx/sources.d/clickhouse.sources

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ Types: deb 
URIs: https://packages.clickhouse.com/deb

Suites: stable

Components: main

Signed-By: /usr/share/keyrings/clickhouse.gpg
 
Signed-By: /etc/apt/keyrings/clickhouse.asc

toolbx/sources.d/cloudposse.sources

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ Types: deb deb-src 
URIs: https://dl.cloudsmith.io/public/cloudposse/packages/deb/debian

Suites: any-version

Components: main

Signed-By: /usr/share/keyrings/cloudposse.gpg
 
Signed-By: /etc/apt/keyrings/cloudposse.asc

toolbx/sources.d/docker.sources

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ Types: deb 
URIs: https://download.docker.com/linux/debian

Suites: bookworm

Components: stable

Signed-By: /usr/share/keyrings/docker.gpg
 
Signed-By: /etc/apt/keyrings/docker.asc