summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Volkov <av903u@att.com>2018-10-22 16:06:16 +0000
committerAndrey Volkov <av903u@att.com>2018-10-23 14:52:33 -0700
commit763fec9dddce2c026ef9174c156f57d6725684cb (patch)
tree15369440f6abee4d120854d4b7056fea2f925692
parent03c75837216d3d6e5ad7971f0c5b468ecea18400 (diff)
Allow to provide external GPG key for image build
-rw-r--r--Dockerfile1
-rw-r--r--assets/gpg/.empty0
-rwxr-xr-xassets/startup.sh1
3 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index e5f49b8..a5ec859 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,6 +63,7 @@ ENV HOSTNAME ${HOSTNAME}
63ENV MODE ${MODE} 63ENV MODE ${MODE}
64 64
65COPY assets/packages /opt/packages 65COPY assets/packages /opt/packages
66COPY assets/gpg/* /opt/aptly/
66 67
67RUN /opt/startup.sh 68RUN /opt/startup.sh
68 69
diff --git a/assets/gpg/.empty b/assets/gpg/.empty
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/assets/gpg/.empty
diff --git a/assets/startup.sh b/assets/startup.sh
index 8752c0e..fe2543f 100755
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -16,7 +16,6 @@ if [[ ! -f /opt/aptly/aptly.sec ]] || [[ ! -f /opt/aptly/aptly.pub ]]; then
16 echo "Generating new gpg keys" 16 echo "Generating new gpg keys"
17 cp -a /dev/urandom /dev/random 17 cp -a /dev/urandom /dev/random
18 /opt/gpg_batch.sh 18 /opt/gpg_batch.sh
19 mkdir -p /opt/aptly
20 # If your system doesn't have a lot of entropy this may, take a long time 19 # If your system doesn't have a lot of entropy this may, take a long time
21 # Google how-to create "artificial" entropy if this gets stuck 20 # Google how-to create "artificial" entropy if this gets stuck
22 gpg -v --batch --gen-key /opt/gpg_batch 21 gpg -v --batch --gen-key /opt/gpg_batch