diff --git a/toolbx/Dockerfile b/toolbx/Dockerfile index b1614d2f0c8c5d59aadaf9c578fc3e4d2fbb5a43..62b167e3efec9a8a47f946ff16e1c3dc1e2dc498 100644 --- a/toolbx/Dockerfile +++ b/toolbx/Dockerfile @@ -15,15 +15,12 @@ RUN rm /etc/apt/apt.conf.d/docker-* && \ /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://cli-assets.heroku.com/apt/release.key | \ - gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/heroku.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 && \ - gpg --no-default-keyring --keyring /usr/share/keyrings/percona.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 9334A25F8507EFA5 && \ gpg --no-default-keyring --keyring /usr/share/keyrings/clickhouse.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8919F6BD2B48D754 && \ ln --symbolic --target /usr/local/bin/ /usr/libexec/flatpak-xdg-utils/* && \ #mkdir /etc/krb5.conf.d && \ diff --git a/toolbx/README.md b/toolbx/README.md index e536df89e58586456354549acf8b18e598bbe0e0..9a2b93f04d2f163f3f1b542311e15c674e80a9a7 100644 --- a/toolbx/README.md +++ b/toolbx/README.md @@ -12,13 +12,11 @@ Toolbox: Also. the following APT repositories are added: -- Heroku. - Google Cloud. - MongoDB. - Hashicorp. - [Cloud Posse](https://github.com/cloudposse/packages). - [Charms](https://charm.sh/). -- Percona. - ClickHouse. This image is based in part on the [toolbx diff --git a/toolbx/sources.d/heroku.list b/toolbx/sources.d/heroku.list deleted file mode 100644 index 2f2aa5fe159b5d54e62e505266e213a33639f472..0000000000000000000000000000000000000000 --- a/toolbx/sources.d/heroku.list +++ /dev/null @@ -1 +0,0 @@ -deb [ signed-by=/usr/share/keyrings/heroku.gpg ] https://cli-assets.heroku.com/apt ./ diff --git a/toolbx/sources.d/percona.sources b/toolbx/sources.d/percona.sources deleted file mode 100644 index b6dea9bd8da287b72ed7b37cf58f8ddb8839c0e5..0000000000000000000000000000000000000000 --- a/toolbx/sources.d/percona.sources +++ /dev/null @@ -1,5 +0,0 @@ -Types: deb -URIs: https://repo.percona.com/apt/ -Suites: bullseye -Components: main -Signed-By: /usr/share/keyrings/percona.gpg