summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Hong <bryan@turbojets.net>2017-05-22 15:12:36 -0700
committerBryan Hong <bryan@turbojets.net>2017-05-22 15:12:36 -0700
commit58f1859003a0d9151307eaaa40d14834e01144d4 (patch)
treeb6485f94ccb3e0dabc22923c8c869f8a4a586a18
parent475bd0ea5b114fe516001a0d8d18ab88686bde6c (diff)
updated aptly key signing fingerprint, path to bash completion
also a minor change to aptly graph in update_mirror.sh
-rw-r--r--Dockerfile4
-rwxr-xr-xassets/update_mirror.sh5
2 files changed, 3 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile
index 40bc53b..ecdfd4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ ENV DEBIAN_FRONTEND noninteractive
20 20
21# Add Aptly repository 21# Add Aptly repository
22RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list 22RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list
23RUN apt-key adv --keyserver keys.gnupg.net --recv-keys E083A3782A194991 23RUN apt-key adv --keyserver keys.gnupg.net --recv-keys 9E3E53F19C7DE460
24 24
25# Add Nginx repository 25# Add Nginx repository
26RUN echo "deb http://nginx.org/packages/ubuntu/ trusty nginx" > /etc/apt/sources.list.d/nginx.list 26RUN echo "deb http://nginx.org/packages/ubuntu/ trusty nginx" > /etc/apt/sources.list.d/nginx.list
@@ -44,7 +44,7 @@ RUN apt-get -q update \
44COPY assets/aptly.conf /etc/aptly.conf 44COPY assets/aptly.conf /etc/aptly.conf
45 45
46# Enable Aptly Bash completions 46# Enable Aptly Bash completions
47RUN wget https://github.com/aptly-dev/aptly-bash-completion/raw/master/aptly \ 47RUN wget https://github.com/smira/aptly/raw/master/bash_completion.d/aptly \
48 -O /etc/bash_completion.d/aptly \ 48 -O /etc/bash_completion.d/aptly \
49 && echo "if ! shopt -oq posix; then\n\ 49 && echo "if ! shopt -oq posix; then\n\
50 if [ -f /usr/share/bash-completion/bash_completion ]; then\n\ 50 if [ -f /usr/share/bash-completion/bash_completion ]; then\n\
diff --git a/assets/update_mirror.sh b/assets/update_mirror.sh
index accdc45..f05052d 100755
--- a/assets/update_mirror.sh
+++ b/assets/update_mirror.sh
@@ -48,8 +48,6 @@ done
48 48
49echo ${SNAPSHOTARRAY[@]} 49echo ${SNAPSHOTARRAY[@]}
50 50
51#### I STOPPED HERE
52
53# Merge snapshots into a single snapshot with updates applied 51# Merge snapshots into a single snapshot with updates applied
54echo "Merging snapshots into one.." 52echo "Merging snapshots into one.."
55aptly snapshot merge -latest \ 53aptly snapshot merge -latest \
@@ -76,5 +74,4 @@ if [[ ! -f /opt/aptly/public/aptly_repo_signing.key ]]; then
76fi 74fi
77 75
78# Generate Aptly Graph 76# Generate Aptly Graph
79aptly graph 77aptly graph -output /opt/aptly/public/aptly_graph.png
80cp `ls -rt /tmp/aptly-graph*.png | tail -n1` /opt/aptly/public/aptly_graph.png