airship
/
utils
Code Issues Proposed changes

updated aptly key signing fingerprint, path to bash completion 

also a minor change to aptly graph in update_mirror.sh
This commit is contained in:
Bryan Hong 2017-05-22 15:12:36 -07:00
parent 475bd0ea5b
commit 58f1859003
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

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

5
assets/update_mirror.sh
View File

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