From e48937e13cf72b47740ef38fea2b911948f99c5f Mon Sep 17 00:00:00 2001
From: finn <finn@janky.solutions>
Date: Mon, 25 Jan 2021 01:16:48 -0800
Subject: [PATCH] package apt-signing-key into signald-builder image

---
 apt-signing-key.asc        | 31 +++++++++++++++++++++++++++++++
 signald-builder.Dockerfile |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 apt-signing-key.asc

diff --git a/apt-signing-key.asc b/apt-signing-key.asc
new file mode 100644
index 0000000..89484f7
--- /dev/null
+++ b/apt-signing-key.asc
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFuazg4BCACuz8352FK7Z89KpFEam5u7Xh3OB1ZPxJvh+sHVgrZbNYalYPxW
+yHF0ULRPPsVHu02W5AM/O/qbMGEe0JbQvIxdCWAzGGL0fPgR3xn6hBGUDlCTQyDc
+keok6jWQsy9etqTTu1eyHaREJpLvKAGXN7Bk2pOIv3WSufYNLTgbdqBCk854n7/P
+dvQkU6OFBSU8XiG5UAx5n8mJcmt5JiWa4CEUoJN7IsLTI4YKd2pG4BmXTtfCEk5J
+BraPtNxwgRVdM9bWdBfYlftIK1JCPcc5WdN9ejgH0s43rbwRnT3nk5O/XQF3GtO9
+j5UxEu86Xa4zSlYVttL1rWmgdLiEVHzdbK/LABEBAAG0NUphbmt5IFNvbHV0aW9u
+cyBCdWlsZCBTZXJ2ZXIgPGJ1aWxkc0BqYW5reS5zb2x1dGlvbnM+iQFUBBMBCAA+
+AhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAFiEE2J/7RSkSKaQQoUMKZZR1CB9m
+XykFAl76qqcFCQzF3hkACgkQZZR1CB9mXym7LggAl/DFBdMhsUxMvbXRWl2QixFT
+wLZnrkKZwX8Wpab0CRSbme+0vSDfx7t/y65KECQl/tIX2ifP9bjz4FKEMJ/GuDHS
+JPdf63EFr+09iGkouC+vPyQMBhY9NqzlZ5Zzt42kHYt0CPw3Kpl1eUyjyFYmhDY6
+zEK4K5EVXgu2Dj4ZBy3pmt6P/Gfdm33zGB4aw9mWNyQ0V0yUMbv77pLKhF8XulX+
+KbNNr9Osqdt8xi3LR06H8BwB6gvxudql62JSvQvO1kRlyQ4ZJwwx96rFHMqeuUzs
+faYCS9toSiWNytA5WBXr/QURRhJg8V/duR/PjTDgy4/YFO83syUhxAheXdkfE7kB
+DQRbms4OAQgAroyEoIpMtNogrWGzsq0twtMSJNnaR7+Bd1x54+M/O2HNzFBHpT/W
+4vYeSSWmfGnKx7E/SgjY3zM8wV/ahSHfVlGv5IpaEj5OsakJNO12UK+3Yike4tTy
+U7ONAA/pZtCRQz0PHkGoCZlOfSCU8Tr+RuAJE24j8EhMzbDOdUn7z18LpsBqfA5G
+f2CGcgCoI6o00GPqvKdx975sGuoRlQ0VNMQADMvRBrQnRddmF8fd+p1eWeQgUH7j
+LbpSBT4zKZwYL7JsTYuDeb+GvaTxnBtL8yTF2A7MYl5PooycvIHIJ8tSjy4U2T2e
+/nuFcKyC4hbwuuZMyC9qABgIsMs6DFYyswARAQABiQE8BBgBCAAmAhsMFiEE2J/7
+RSkSKaQQoUMKZZR1CB9mXykFAl2GavMFCQPM0GUACgkQZZR1CB9mXynD8wf/RV1H
+9Jo500QbA3T+Ao+lvAe5y89ydhxeJmPNu2snGrQuxz4FgCdVyIUtsq/pKIVD+SIY
+U/uXidoOtfBkh8vZ+YPiRjKuyV+d6p1Ke+mHwV6jRM/IyxNCxRJULyZh5VbOcFXN
+1ftH5GkLHEUeOtXu9URcYBHNBaIKYC0JxUQ9ce9F1bw3h3c0Tpl/+kFxVQ3hNKTp
+bSpnHwEXvjLwP0muW8Wy7nK2a+yZrXjBQDcoE2sx9oJaHtynWruVKmTzy214gUgS
+gyfRRGfne79N6ek6bcQQ9DBoSEslELEC/Ki/nwG9jChObt5Z9L6iRxXgD51DIaW0
+zWh8fxxloSY15g7/GA==
+=0oUH
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/signald-builder.Dockerfile b/signald-builder.Dockerfile
index 7152fb4..0fe0dc7 100644
--- a/signald-builder.Dockerfile
+++ b/signald-builder.Dockerfile
@@ -19,3 +19,5 @@ COPY deb-scripts/release-deb.sh /usr/bin/release-deb
 COPY deb-scripts/get-component.sh /usr/bin/get-component
 COPY deb-scripts/repo-cron.sh /usr/bin/repo-cron
 USER signald
+RUN add apt-signing-key.asc /tmp/apt-signing-key.asc
+RUN gpg --no-default-keyring --keyring trustedkeys.gpg --import /tmp/apt-signing-key.asc