From 54f8557ea3f39a1817e9a0c77a52dfaee131078f Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 29 Oct 2022 23:09:04 +0300
Subject: [PATCH] Toolbx: Remove the Heroku and Percona repos.
With the recent changes with Heroku I don't see myself using Heroku any
time soon. As for Percona, I did a test with XtraBackup, but it requires
direct access to the database files so it's not useful in a Toolbx
container.
---
toolbx/Dockerfile | 3 ---
toolbx/README.md | 2 --
toolbx/sources.d/heroku.list | 1 -
toolbx/sources.d/percona.sources | 5 -----
4 files changed, 11 deletions(-)
delete mode 100644 toolbx/sources.d/heroku.list
delete mode 100644 toolbx/sources.d/percona.sources
diff --git a/toolbx/Dockerfile b/toolbx/Dockerfile
index b1614d2..62b167e 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 e536df8..9a2b93f 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 2f2aa5f..0000000
--- 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 b6dea9b..0000000
--- 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
--
GitLab