Browse Source

updated aptly key signing fingerprint, path to bash completion

also a minor change to aptly graph in update_mirror.sh
tags/v1.0
Bryan Hong 2 years ago
parent
commit
58f1859003
2 changed files with 3 additions and 6 deletions
  1. 2
    2
      Dockerfile
  2. 1
    4
      assets/update_mirror.sh

+ 2
- 2
Dockerfile View File

@@ -20,7 +20,7 @@ ENV DEBIAN_FRONTEND noninteractive
20 20
 
21 21
 # Add Aptly repository
22 22
 RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list
23
-RUN apt-key adv --keyserver keys.gnupg.net --recv-keys E083A3782A194991
23
+RUN apt-key adv --keyserver keys.gnupg.net --recv-keys 9E3E53F19C7DE460
24 24
 
25 25
 # Add Nginx repository
26 26
 RUN 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                  \
44 44
 COPY assets/aptly.conf /etc/aptly.conf
45 45
 
46 46
 # Enable Aptly Bash completions
47
-RUN wget https://github.com/aptly-dev/aptly-bash-completion/raw/master/aptly \
47
+RUN wget https://github.com/smira/aptly/raw/master/bash_completion.d/aptly \
48 48
   -O /etc/bash_completion.d/aptly \
49 49
   && echo "if ! shopt -oq posix; then\n\
50 50
   if [ -f /usr/share/bash-completion/bash_completion ]; then\n\

+ 1
- 4
assets/update_mirror.sh View File

@@ -48,8 +48,6 @@ done
48 48
 
49 49
 echo ${SNAPSHOTARRAY[@]}
50 50
 
51
-#### I STOPPED HERE
52
-
53 51
 # Merge snapshots into a single snapshot with updates applied
54 52
 echo "Merging snapshots into one.." 
55 53
 aptly snapshot merge -latest                 \
@@ -76,5 +74,4 @@ if [[ ! -f /opt/aptly/public/aptly_repo_signing.key ]]; then
76 74
 fi
77 75
 
78 76
 # Generate Aptly Graph
79
-aptly graph
80
-cp `ls -rt /tmp/aptly-graph*.png | tail -n1` /opt/aptly/public/aptly_graph.png
77
+aptly graph -output /opt/aptly/public/aptly_graph.png

Loading…
Cancel
Save