Skip to content

Commit cb97507

Browse files
committed
Updated prepare-image-* scripts for minor optimizations.
1 parent 3ae5add commit cb97507

4 files changed

Lines changed: 36 additions & 5 deletions

File tree

contrib/digitalocean/prepare-digitalocean-snapshot.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,24 @@ apt-get upgrade -yq
2424
# install HTTPS transport support
2525
apt-get install -qy apt-transport-https
2626

27+
# Preinstall Deis recipe packages
28+
apt-get install -yq python-setuptools python-pip debootstrap git make rsyslog
29+
30+
# Add the Nginx repository key to our local keychain
31+
# using apt-key finger you can check the fingerprint matches 573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62
32+
curl http://nginx.org/keys/nginx_signing.key | apt-key add -
33+
34+
# Add the Nginx repository to our apt sources list
35+
echo deb http://nginx.org/packages/ubuntu precise nginx > /etc/apt/sources.list.d/nginx-ppa.list
36+
2737
# install docker's dependencies
2838
apt-get install python-software-properties -y
2939

30-
# Add the Docker repository key to your local keychain
40+
# Add the Docker repository key to our local keychain
3141
# using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9
3242
curl https://get.docker.io/gpg | apt-key add -
3343

34-
# Add the Docker repository to your apt sources list.
44+
# Add the Docker repository to our apt sources list.
3545
echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
3646

3747
# upgrade to latest packages

contrib/ec2/prepare-ubuntu-ami.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@
1818
# Remove old kernel(s)
1919
dpkg -l 'linux-*' | sed '/^ii/!d;/'"$(uname -r | sed "s/\(.*\)-\([^0-9]\+\)/\1/")"'/d;s/^[^ ]* [^ ]* \([^ ]*\).*/\1/;/[0-9]/!d' | xargs sudo apt-get -y purge
2020

21-
apt-get install python-software-properties -y
21+
apt-get install fail2ban python-software-properties -y
22+
23+
# Add the Nginx repository key to our local keychain
24+
# using apt-key finger you can check the fingerprint matches 573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62
25+
curl http://nginx.org/keys/nginx_signing.key | apt-key add -
26+
27+
# Add the Nginx repository to our apt sources list
28+
echo deb http://nginx.org/packages/ubuntu precise nginx > /etc/apt/sources.list.d/nginx-ppa.list
2229

2330
# Add the Docker repository key to your local keychain
2431
# using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9

contrib/rackspace/prepare-rackspace-image.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@
1919
# Remove old kernel(s)
2020
dpkg -l 'linux-*' | sed '/^ii/!d;/'"$(uname -r | sed "s/\(.*\)-\([^0-9]\+\)/\1/")"'/d;s/^[^ ]* [^ ]* \([^ ]*\).*/\1/;/[0-9]/!d' | xargs sudo apt-get -y purge
2121

22-
apt-get install python-software-properties -y
22+
apt-get install fail2ban python-software-properties -y
23+
24+
# Add the Nginx repository key to our local keychain
25+
# using apt-key finger you can check the fingerprint matches 573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62
26+
curl http://nginx.org/keys/nginx_signing.key | apt-key add -
27+
28+
# Add the Nginx repository to our apt sources list
29+
echo deb http://nginx.org/packages/ubuntu precise nginx > /etc/apt/sources.list.d/nginx-ppa.list
2330

2431
# Add the Docker repository key to your local keychain
2532
# using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9

contrib/vagrant/prepare-ubuntu-box.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@ dpkg -l 'linux-*' | sed '/^ii/!d;/'"$(uname -r | sed "s/\(.*\)-\([^0-9]\+\)/\1/"
2121
rm -f /home/${account}/{*.iso,postinstall*.sh}
2222

2323
# Install some essentials and mDNS daemon
24-
apt-get install python-software-properties curl apt-transport-https -y
24+
apt-get install fail2ban python-software-properties curl apt-transport-https -y
25+
26+
# Add the Nginx repository key to our local keychain
27+
# using apt-key finger you can check the fingerprint matches 573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62
28+
curl http://nginx.org/keys/nginx_signing.key | apt-key add -
29+
30+
# Add the Nginx repository to our apt sources list
31+
echo deb http://nginx.org/packages/ubuntu precise nginx > /etc/apt/sources.list.d/nginx-ppa.list
2532

2633
# Add the Docker repository key to your local keychain
2734
# using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9

0 commit comments

Comments
 (0)