From 713d3232df1785eb948170feb592038fd387cbb8 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 29 Oct 2022 23:21:15 +0300
Subject: [PATCH] Base on my toolbx base image.
---
.dockerignore | 2 --
Dockerfile | 33 ++-------------------------------
preferences.d/cloudposse | 3 ---
sources.d/clickhouse.sources | 5 -----
sources.d/cloudposse.sources | 5 -----
sources.d/google-cloud.sources | 5 -----
sources.d/hashicorp.sources | 5 -----
sources.d/heroku.list | 1 -
sources.d/mongodb.sources | 5 -----
sources.d/percona.sources | 5 -----
10 files changed, 2 insertions(+), 67 deletions(-)
delete mode 100644 preferences.d/cloudposse
delete mode 100644 sources.d/clickhouse.sources
delete mode 100644 sources.d/cloudposse.sources
delete mode 100644 sources.d/google-cloud.sources
delete mode 100644 sources.d/hashicorp.sources
delete mode 100644 sources.d/heroku.list
delete mode 100644 sources.d/mongodb.sources
delete mode 100644 sources.d/percona.sources
diff --git a/.dockerignore b/.dockerignore
index 53f30be..857ef49 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,3 @@
*
!bash_completion.d/*
!bin/*
-!preferences.d/*
-!sources.d/*
diff --git a/Dockerfile b/Dockerfile
index e0d8823..c9cd5d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,6 @@
-FROM docker.io/library/debian:testing-backports
+# hadolint ignore=DL3007
+FROM registry.shore.co.il/toolbx:latest
SHELL ["/bin/bash", "-o", "pipefail", "-xc"]
-# hadolint ignore=DL3008
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- ca-certificates \
- curl \
- gnupg \
- && \
- export GNUPGHOME=/tmp/gnupghome && \
- mkdir --mode=0700 "$GNUPGHOME" && \
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg > \
- /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 && \
- 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 && \
- rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
-COPY --chown=root:root sources.d/* /etc/apt/sources.list.d/
-COPY --chown=root:root preferences.d/* /etc/apt/preferences.d/
# hadolint ignore=DL3008,DL3013,DL3016,DL3027,DL4001
RUN apt-get update && \
curl --location --silent --fail --show-error https://github.com/kubernetes/kompose/releases/download/v1.26.1/kompose_1.26.1_amd64.deb --output /tmp/kompose.deb && \
@@ -179,7 +156,6 @@ RUN apt-get update && \
&& \
sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/; s/# en_IL UTF-8/en_IL UTF-8/; s/# he_IL.UTF-8 UTF-8/he_IL.UTF-8 UTF-8/;' /etc/locale.gen && \
locale-gen && \
- ln --symbolic --target /usr/local/bin/ /usr/libexec/flatpak-xdg-utils/* && \
python3 -m pip install --use-deprecated=legacy-resolver --no-cache-dir \
https://github.com/aws/aws-cli/archive/refs/heads/v2.zip \
ansible \
@@ -300,17 +276,12 @@ RUN apt-get update && \
wget https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem -qO - | \
awk '/-----BEGIN[A-Z0-9 ]*CERTIFICATE-----/ {n++} n > 0 {print > ("/usr/local/share/ca-certificates/rds-" (1+n) ".crt")}' && \
update-ca-certificates && \
- mkdir /etc/krb5.conf.d && \
- echo 'VARIANT_ID=container' >> /etc/os-release && \
echo "export PATH=$GOPATH/bin:\$PATH" > /etc/profile.d/workbench.sh && \
- touch /etc/localtime && \
# pragma: allowlist nextline secret
rm /etc/ssh/ssh_host_* && \
rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/* ~/.cache/*
COPY --chown=root:root bash_completion.d/* /etc/bash_completion.d/
COPY --chown=root:root bin/* /usr/local/bin/
-LABEL com.github.containers.toolbox="true" \
- com.github.debarshiray.toolbox="true"
ENV PATH /usr/local/lib/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV ASDF_DIR /opt/asdf
VOLUME /run/sshd
diff --git a/preferences.d/cloudposse b/preferences.d/cloudposse
deleted file mode 100644
index f116112..0000000
--- a/preferences.d/cloudposse
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: *
-Pin: release o=https://cloudsmith.io
-Pin-Priority: 400
diff --git a/sources.d/clickhouse.sources b/sources.d/clickhouse.sources
deleted file mode 100644
index 7ff6432..0000000
--- a/sources.d/clickhouse.sources
+++ /dev/null
@@ -1,5 +0,0 @@
-Types: deb
-URIs: https://packages.clickhouse.com/deb
-Suites: stable
-Components: main
-Signed-By: /usr/share/keyrings/clickhouse.gpg
diff --git a/sources.d/cloudposse.sources b/sources.d/cloudposse.sources
deleted file mode 100644
index 4dd3a48..0000000
--- a/sources.d/cloudposse.sources
+++ /dev/null
@@ -1,5 +0,0 @@
-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
diff --git a/sources.d/google-cloud.sources b/sources.d/google-cloud.sources
deleted file mode 100644
index fc8038f..0000000
--- a/sources.d/google-cloud.sources
+++ /dev/null
@@ -1,5 +0,0 @@
-Types: deb
-URIs: https://packages.cloud.google.com/apt
-Suites: cloud-sdk
-Components: main
-Signed-By: /usr/share/keyrings/google-cloud.gpg
diff --git a/sources.d/hashicorp.sources b/sources.d/hashicorp.sources
deleted file mode 100644
index f01300c..0000000
--- a/sources.d/hashicorp.sources
+++ /dev/null
@@ -1,5 +0,0 @@
-Types: deb
-URIs: https://apt.releases.hashicorp.com
-Suites: buster
-Components: main
-Signed-By: /usr/share/keyrings/hashicorp.gpg
diff --git a/sources.d/heroku.list b/sources.d/heroku.list
deleted file mode 100644
index 2f2aa5f..0000000
--- a/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/sources.d/mongodb.sources b/sources.d/mongodb.sources
deleted file mode 100644
index bb92c98..0000000
--- a/sources.d/mongodb.sources
+++ /dev/null
@@ -1,5 +0,0 @@
-Types: deb
-URIs: https://repo.mongodb.org/apt/debian
-Suites: buster/mongodb-org/5.0
-Components: main
-Signed-By: /usr/share/keyrings/mongodb.gpg
diff --git a/sources.d/percona.sources b/sources.d/percona.sources
deleted file mode 100644
index b6dea9b..0000000
--- a/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